Changeset 22879

Timestamp:

11/07/08 02:37:10 (5 years ago)

Author:

drry

Message:

• cosmetic changes.
  

Location:

platform/firefox/FireMobileSimulator/trunk/src

Files:

• chrome/content/common/carrier.js (modified) (3 diffs)
• chrome/content/core.js (modified) (2 diffs)
• chrome/content/options/options.js (modified) (4 diffs)
• chrome/content/overlay.js (modified) (5 diffs)
• components/msimModifyHeaders.js (modified) (2 diffs)

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

@@ -36 +36 @@
 
 /**
- * 各キャリアを示す定数配列 
+ * 各キャリアを示す定数配列
  */
 firemobilesimulator.common.carrier.carrierArray = [firemobilesimulator.common.carrier.DOCOMO, firemobilesimulator.common.carrier.AU, firemobilesimulator.common.carrier.SOFTBANK];
 
 /**
- * 各キャリアの正式名称を示すマップ 
+ * 各キャリアの正式名称を示すマップ
  */
 firemobilesimulator.common.carrier.carrierName = {
@@ -50 +50 @@
 
 /**
- * キャリア共通の属性 
+ * キャリア共通の属性
  */
 firemobilesimulator.common.carrier.deviceBasicAttribute = ["label", "useragent", "carrier"];
@@ -60 +60 @@
         DC : [],
         AU : ["x-up-devcap-multimedia", "x-up-devcap-cc", "x-up-devcap-iscolor",
-                        "x-up-devcap-max-pdu", "x-up-devcap-numsoftkeys",
-                        "x-up-devcap-qvga", "x-up-devcap-screenchars",
-                        "x-up-devcap-screendepth", "x-up-devcap-screenpixels",
-                        "x-up-devcap-softkeysize", "x-up-devcap-titlebar"],
+              "x-up-devcap-max-pdu", "x-up-devcap-numsoftkeys",
+              "x-up-devcap-qvga", "x-up-devcap-screenchars",
+              "x-up-devcap-screendepth", "x-up-devcap-screenpixels",
+              "x-up-devcap-softkeysize", "x-up-devcap-titlebar"],
         SB : ["x-jphone-msname", "x-jphone-display", "x-jphone-color"]
 };

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

@@ -65 +65 @@
 
 firemobilesimulator.core.deleteDevice = function(carrier, deletedId) {
-        var prefPrefix = "msim.devicelist." + carrier + "." + deletedId + "."
-        firemobilesimulator.common.carrier.deviceBasicAttribute.concat(firemobilesimulator.common.carrier.deviceAttribute[carrier]).forEach(function(attribute){
+        var prefPrefix = "msim.devicelist." + carrier + "." + deletedId + ".";
+        firemobilesimulator.common.carrier.deviceBasicAttribute.concat(firemobilesimulator.common.carrier.deviceAttribute[carrier]).forEach(function(attribute) {
                 firemobilesimulator.common.pref.deletePref(prefPrefix+attribute);
         });
 
         //既に使われている端末だったら設定をリセット
-        if(firemobilesimulator.common.pref.copyUnicharPref("msim.current.id") == deletedId && firemobilesimulator.common.pref.copyUnicharPref("msim.current.carrier") == carrier){
+        if (firemobilesimulator.common.pref.copyUnicharPref("msim.current.id") == deletedId && firemobilesimulator.common.pref.copyUnicharPref("msim.current.carrier") == carrier) {
                 firemobilesimulator.core.resetDevice();
         }
@@ -79 +79 @@
         //dump(deletedId+":"+count+"\n");
         //dump((deletedId+1)+":"+count+"\n");
-        for(var i=deletedId+1; i<=count; i++){
+        for (var i=deletedId+1; i<=count; i++) {
                 //dump("[msim]Debug : Id is not the last one. Re-arrange ids.\n");
                 var sPrefPrefix = "msim.devicelist." + carrier + "." + i + ".";
                 var ePrefPrefix = "msim.devicelist." + carrier + "." + (i-1) + ".";
-                firemobilesimulator.common.carrier.deviceBasicAttribute.concat(firemobilesimulator.common.carrier.deviceAttribute[carrier]).forEach(function(attribute){
+                firemobilesimulator.common.carrier.deviceBasicAttribute.concat(firemobilesimulator.common.carrier.deviceAttribute[carrier]).forEach(function(attribute) {
                         firemobilesimulator.common.pref.setUnicharPref(ePrefPrefix+attribute, firemobilesimulator.common.pref.copyUnicharPref(sPrefPrefix+attribute));
                 });

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

@@ -32 +32 @@
         var retVals = {};
         if (window.openDialog("chrome://msim/content/options/dialogs/device.xul",
-                        "msim-device-dialog", "centerscreen,chrome,modal,resizable", "add",
-                        null, null, retVals)) {
+                              "msim-device-dialog", "centerscreen,chrome,modal,resizable", "add",
+                              null, null, retVals)) {
                 if (retVals.id && retVals.carrier) {
                         var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
                         var deviceBox = pageDocument.getElementById("msim-listbox");
                         var listItem = deviceBox.appendItem(retVals.carrier + ":"
-                                                        + retVals.deviceName, retVals.userAgent);
+                                                            + retVals.deviceName, retVals.userAgent);
                         listItem.setAttribute("carrier", retVals.carrier);
                         listItem.setAttribute("id", retVals.id);
@@ -52 +52 @@
 firemobilesimulator.options.changePage = function(pageList) {
         firemobilesimulator.options.storeOptions();
-        document.getElementById("msim-options-iframe").setAttribute("src",
-                        pageList.selectedItem.getAttribute("value"));
+        document.getElementById("msim-options-iframe")
+                .setAttribute("src", pageList.selectedItem.getAttribute("value"));
 };
 
@@ -63 +63 @@
         if (selectedItem
                         && confirm(document.getElementById("msim-string-bundle")
-                                        .getString("msim_deleteConfirmation"))) {
+                                           .getString("msim_deleteConfirmation"))) {
                 var carrier = selectedItem.getAttribute("carrier");
                 var deletedId = parseInt(selectedItem.getAttribute("id"));
@@ -452 +452 @@
                                 eId.appendChild(xmlDocument.createTextNode(i));
                                 var eDeviceName = xmlDocument.createElement("DeviceName");
-                                eDeviceName.appendChild(xmlDocument.createTextNode(deviceName))
+                                eDeviceName.appendChild(xmlDocument.createTextNode(deviceName));
                                 var eUserAgent = xmlDocument.createElement("UserAgent");
                                 eUserAgent.appendChild(xmlDocument.createTextNode(useragent));

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

@@ -46 +46 @@
                 //              firemobilesimulator.overlay.BrowserOnLoad, true);
                 var appcontent = document.getElementById("appcontent");   // ブラウザ
-                if(appcontent){
+                if (appcontent) {
                         dump("###\n");
                         //appcontent.addEventListener("DOMContentLoaded", firemobilesimulator.overlay.BrowserOnLoad, true);
                         appcontent.addEventListener("load", firemobilesimulator.overlay.BrowserOnLoad, true);
-                }else{
+                } else {
                         dump("[msim]no appcontent.\n");
                 }
@@ -109 +109 @@
 
         firemobilesimulator.common.carrier.carrierArray.forEach(function(carrier) {
-                
+
                 dump("init:"+carrier+"\n");
                 var deviceCount = firemobilesimulator.common.pref
@@ -196 +196 @@
         if (carrier) {
                 var ndDocument = objEvent.originalTarget;
-                if(objEvent.originalTarget.nodeName != "#document"){
-                        dump("[msim]nodeName is not #document\n")
+                if (objEvent.originalTarget.nodeName != "#document") {
+                        dump("[msim]nodeName is not #document\n");
                         return;
                 }
@@ -204 +204 @@
                 //      return;
                 //}
-                
+
                 //フォントを等幅に統一
                 ndDocument.body.style.fontFamily = "monospace";
-                
+
                 //表示領域サイズの制御（現在は横幅のみ）
                 var forceScreenWidth = firemobilesimulator.common.pref
-                                .getBoolPref("msim.config.general.force-screen-width")
+                                .getBoolPref("msim.config.general.force-screen-width");
                 var forceScreenHeight = firemobilesimulator.common.pref
-                                .getBoolPref("msim.config.general.force-screen-height")
+                                .getBoolPref("msim.config.general.force-screen-height");
 
                 if (forceScreenWidth) {
@@ -302 +302 @@
                         var pictogramConverterEnabled = firemobilesimulator.common.pref
                                         .getBoolPref("msim.config." + carrier
-                                                        + ".pictogram.enabled")
+                                                        + ".pictogram.enabled");
                         if (pictogramConverterEnabled) {
                                 dump("[msim]convert pictogram in overlay.js\n");

platform/firefox/FireMobileSimulator/trunk/src/components/msimModifyHeaders.js

@@ -106 +106 @@
                                                 if (uri.scheme != "https") {
                                                         // HTTPSではUID送信とiモードID送信は行わない
-                                                        
+
                                                         values = values.map(function(value) {
                                                                 if (value.toUpperCase() == "UID=NULLGWDOCOMO") {
@@ -304 +304 @@
         var documentLoad = subject.loadFlags & (1<<16);
         //TODO: <img src="...">の指定などでrewriteする場合に対応要
-        if(documentLoad){
+        if (documentLoad) {
                 subject.loadFlags = Ci.nsICachingChannel.LOAD_ONLY_FROM_CACHE;
                 subject.cancel(Cr.NS_ERROR_FAILURE);
                 var webNav = subject.notificationCallbacks
-                                .getInterface(Ci.nsIWebNavigation);                                     
+                                .getInterface(Ci.nsIWebNavigation);
                 webNav.loadURI(url, Ci.nsIWebNavigation.LOAD_FLAGS_NONE, null, null, null);
                 //webNav.loadURI(url, subject.loadFlags, null, null, null);