Changeset 33399

Timestamp:

05/18/09 18:40:26 (4 years ago)

Author:

thorikawa

Message:

merge Ver.1.1.4 and Ver.1.1.5

Location:

platform/firefox/FireMobileSimulator/trunk/src

Files:

• chrome/content/about.xul (modified) (1 diff)
• chrome/content/common/carrier.js (modified) (1 diff)
• chrome/content/contentHandler.js (modified) (1 diff)
• chrome/content/contentHandler/common.js (modified) (2 diffs)
• chrome/content/contentHandler/docomo.js (modified) (1 diff)
• chrome/content/options/dialogs/device.js (modified) (2 diffs)
• install.rdf (modified) (2 diffs)

platform/firefox/FireMobileSimulator/trunk/src/chrome/content/about.xul

@@ -28 +28 @@
 <vbox>
   <label value="FireMobileSimulator" style="font-weight: bold; font-size: x-large;"/>
-  <label value="&version; 1.2.0pre"/>
+  <label value="&version; 1.2.0beta"/>
   <separator class="thin"/>
   <label value="&createdBy;" style="font-weight: bold;"/>

platform/firefox/FireMobileSimulator/trunk/src/chrome/content/common/carrier.js

@@ -121 +121 @@
 firemobilesimulator.common.carrier.getDoCoMoUserAgent = function(useragent, id) {
         var type1 = firemobilesimulator.common.pref.copyUnicharPref("msim.devicelist."+id+".type1");
-        var cache = firemobilesimulator.common.pref.copyUnicharPref("msim.devicelist."+id+".cache");
+        var cache = firemobilesimulator.common.pref.copyUnicharPref("msim.devicelist."+id+".cache") || 100;
         if (firemobilesimulator.common.carrier.Type[firemobilesimulator.common.carrier.DOCOMO].DOCOMO_FOMA == type1) {
                 //TODO ;TB;WxxHxxの部分も動的に組み立てられるようにする

platform/firefox/FireMobileSimulator/trunk/src/chrome/content/contentHandler.js

@@ -28 +28 @@
 firemobilesimulator.contentHandler.factoryMap[firemobilesimulator.common.carrier.AU] = firemobilesimulator.contentHandler.au;
 firemobilesimulator.contentHandler.factoryMap[firemobilesimulator.common.carrier.SOFTBANK] = firemobilesimulator.contentHandler.softbank;
+firemobilesimulator.contentHandler.factoryMap[firemobilesimulator.common.carrier.OTHER] = firemobilesimulator.contentHandler.common; 
 
 firemobilesimulator.contentHandler.factory = function (carrier) {

platform/firefox/FireMobileSimulator/trunk/src/chrome/content/contentHandler/common.js

@@ -27 +27 @@
         filter : function (ndDocument, deviceId) {
                 if (ndDocument.body) {
-                        //フォントを等幅に統一
+                        // フォントを等幅に統一
                         ndDocument.body.style.fontFamily = "monospace";
 
-                        //表示領域サイズの制御（現在は横幅のみ）
+                        // 禁則処理を無効化
+                        firemobilesimulator.contentHandler.common.recursiveParse(ndDocument.body); 
+                        
+                        // 表示領域サイズの制御（現在は横幅のみ）
                         var forceScreenWidth = firemobilesimulator.common.pref
                                         .getBoolPref("msim.config.general.force-screen-width");
@@ -78 +81 @@
                         }
                 };
+        },
+        
+        recursiveParse : function (pNode) {
+                var childs = pNode.childNodes;
+                dump("parseChilds:"+childs.length+"\n");
+                for (var i = 0; i < childs.length; i++) {
+                        var cNode = childs[i];
+                        if (childs[i].nodeType == 1) {
+                                firemobilesimulator.contentHandler.common.recursiveParse(childs[i]);
+                        }else if(cNode.nodeType == 3) {
+                                if(cNode.nodeValue.match("[^\n ]")){
+                                        var separator;
+                                        if(navigator.userAgent.indexOf('Firefox/2') != -1) {
+                                                separator = '<wbr />'
+                                        } else {
+                                                separator = String.fromCharCode(8203);
+                                        }
+                                        dump("word-break:replace textNode\n")
+                                        var chNode = document.createTextNode(cNode.nodeValue.split("").join(separator));
+                                        dump(cNode.nodeValue.split("").join(separator) + "\n");
+                                        cNode.parentNode.replaceChild(chNode,cNode);
+                                }
+                        }
+                }
         }
 };

platform/firefox/FireMobileSimulator/trunk/src/chrome/content/contentHandler/docomo.js

@@ -52 +52 @@
 
                 var anchorTags = ndDocument.getElementsByTagName("a");
-                for (var i = 0, l = anchorTags.length; i++) {
+                for (var i = 0, l = anchorTags.length; i < l; i++) {
                         var anchorTag = anchorTags[i];
                         var utn = anchorTag.getAttribute("utn");

platform/firefox/FireMobileSimulator/trunk/src/chrome/content/options/dialogs/device.js

@@ -106 +106 @@
                 var carrier = firemobilesimulator.options.dialogs.device.carrier;
 
+                var deviceName = document.getElementById("msim.options.device.label").value;
+                var userAgent = document.getElementById("msim.options.device.useragent").value;
+                var si = document.getElementById("msim.options.device.type.menulist").selectedItem; 
+                var type1 = si ? si.getAttribute("label") : null;
+                var screenWidth = document.getElementById("msim.options.device.screen-width").value;
+                var screenHeight = document.getElementById("msim.options.device.screen-height").value;
+
+                // 入力チェック
+                if (!deviceName || !carrier || !userAgent) {
+                        dump("[msim]Warning : Required field is null.\n");
+                        alert(firemobilesimulator.options.dialogs.device.stringBundle
+                                        .getString("msim_editDeviceRequirementValidation"));
+                        return false;
+                }
+                
                 if (firemobilesimulator.options.dialogs.device.windowType == "add") {
                         // carrier =
@@ -116 +131 @@
                 }
 
-                dump("save-carrier:" + carrier + "\n");
-                dump("save-id:" + saveId + "\n");
-
-                var deviceName = document.getElementById("msim.options.device.label").value;
-                var userAgent = document.getElementById("msim.options.device.useragent").value;
-                var type1 = document.getElementById("msim.options.device.type.menulist").selectedItem.getAttribute("label");
-                var screenWidth = document.getElementById("msim.options.device.screen-width").value;
-                var screenHeight = document.getElementById("msim.options.device.screen-height").value;
-
-                // 入力チェック
-                if (!deviceName || !carrier || !userAgent) {
-                        dump("[msim]Warning : Required field is null.\n");
-                        alert(firemobilesimulator.options.dialogs.device.stringBundle
-                                        .getString("msim_editDeviceRequirementValidation"));
-                        return false;
-                }
+                //dump("save-carrier:" + carrier + "\n");
+                //dump("save-id:" + saveId + "\n");
+
                 firemobilesimulator.common.pref.setUnicharPref("msim.devicelist." + saveId + ".label", deviceName);
                 firemobilesimulator.common.pref.setUnicharPref("msim.devicelist." + saveId + ".carrier", carrier);

platform/firefox/FireMobileSimulator/trunk/src/install.rdf

@@ -5 +5 @@
     <em:id>{77cc852e-6b45-11dd-929f-d30256d89593}</em:id>
     <em:name>FireMobileSimulator</em:name>
-    <em:version>1.2.0pre</em:version>
+    <em:version>1.2.0beta</em:version>
     <em:creator>Takahiro Horikawa</em:creator>
     <em:aboutURL>chrome://msim/content/about.xul</em:aboutURL>
@@ -13 +13 @@
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
         <em:minVersion>2.0</em:minVersion>
-        <em:maxVersion>3.1.*</em:maxVersion>
+        <em:maxVersion>3.5.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:description>携帯端末のHTTPリクエスト、絵文字表示をシミュレートします。</em:description>
     <em:homepageURL>http://firemobilesimulator.org/</em:homepageURL>
-    <em:updateURL>https://ss1.xrea.com/poly.s49.xrea.com/dev/firefox/fms/update.xml</em:updateURL>
+    <em:updateURL>https://ss1.xrea.com/poly.s49.xrea.com/dev/firefox/fms/update2.xml</em:updateURL>
     <em:iconURL>chrome://msim/skin/msim_icon.png</em:iconURL>
   </Description>