![(please configure the [header_logo] section in trac.ini)](/share/chrome/site/your_project_logo.png){kind=logo}
- Timestamp:
- 09/29/08 12:34:29 (2 months ago)
- Location:
- platform/firefox/FireMobileSimulator/branches/0.1.4.X/src
- Files:
-
- 12 modified
-
chrome/content/about.xul (modified) (1 diff)
-
chrome/content/common/carrier.js (modified) (1 diff)
-
chrome/content/common/preferences.js (modified) (1 diff)
-
chrome/content/common/util.js (modified) (1 diff)
-
chrome/content/html/au_gps.js (modified) (2 diffs)
-
chrome/content/html/dc_openiarea.js (modified) (1 diff)
-
chrome/content/options/dialogs/device.js (modified) (5 diffs)
-
chrome/content/options/options.js (modified) (11 diffs)
-
chrome/content/overlay.js (modified) (12 diffs)
-
components/msimModifyHeaders.js (modified) (7 diffs)
-
components/msimStreamConverter.js (modified) (1 diff)
-
install.rdf (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/about.xul
r19722 r20183 28 28 <vbox> 29 29 <label value="FireMobileSimulator" style="font-weight: bold; font-size: x-large;"/> 30 <label value="&version; 0.1.4 "/>30 <label value="&version; 0.1.4.1b"/> 31 31 <separator class="thin"/> 32 32 <label value="&createdBy;" style="font-weight: bold;"/> -
platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/carrier.js
r19719 r20183 56 56 57 57 var pref_prefix = "msim.devicelist." + carrier + "." + id; 58 pref.setUnicharPref("msim.current.carrier",pref58 msim_pref.setUnicharPref("msim.current.carrier", msim_pref 59 59 .copyUnicharPref(pref_prefix + ".carrier")); 60 pref.setUnicharPref("msim.current.device",pref.copyUnicharPref(pref_prefix60 msim_pref.setUnicharPref("msim.current.device", msim_pref.copyUnicharPref(pref_prefix 61 61 + ".device")); 62 62 63 var useragent = pref.copyUnicharPref(pref_prefix + ".useragent");63 var useragent = msim_pref.copyUnicharPref(pref_prefix + ".useragent"); 64 64 if (SOFTBANK == carrier) { 65 useragent = getSoftBankUserAgent(useragent, pref65 useragent = getSoftBankUserAgent(useragent, msim_pref 66 66 .copyUnicharPref("msim.config.SB.serial")); 67 67 } 68 68 69 pref.setUnicharPref("general.useragent.override", useragent);70 pref.setUnicharPref("msim.current.useragent", useragent);71 pref.setUnicharPref("msim.current.id", id);69 msim_pref.setUnicharPref("general.useragent.override", useragent); 70 msim_pref.setUnicharPref("msim.current.useragent", useragent); 71 msim_pref.setUnicharPref("msim.current.id", id); 72 72 73 msim.updateIcon();73 if(msim) msim.updateIcon(); 74 74 }; 75 75 76 76 function getSoftBankUserAgent(useragent, serial) { 77 var notifySerial = pref.getBoolPref("msim.config.SB.notifyserial");77 var notifySerial = msim_pref.getBoolPref("msim.config.SB.notifyserial"); 78 78 if (true == notifySerial) { 79 79 useragent = useragent.replace("[/Serial]", "/" + serial); -
platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/preferences.js
r19719 r20183 18 18 * ***** END LICENSE BLOCK ***** */ 19 19 20 var jsLoader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"].getService(Components.interfaces.mozIJSSubScriptLoader);21 jsLoader.loadSubScript("chrome://global/content/nsUserSettings.js");20 var msim_jsLoader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"].getService(Components.interfaces.mozIJSSubScriptLoader); 21 msim_jsLoader.loadSubScript("chrome://global/content/nsUserSettings.js"); 22 22 23 var pref = {23 var msim_pref = { 24 24 __proto__ : nsPreferences, 25 25 -
platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/common/util.js
r19720 r20183 216 216 for (var i in params) { 217 217 if(i.toUpperCase() == "UID" && params[i].toUpperCase() == "NULLGWDOCOMO"){ 218 params[i] = pref.copyUnicharPref("msim.config.DC.uid");218 params[i] = msim_pref.copyUnicharPref("msim.config.DC.uid"); 219 219 } 220 220 r += '<input type="hidden" name="'+i+'" value="'+params[i]+'" />\n'; -
platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/html/au_gps.js
r19719 r20183 20 20 function auLocationInit(params) { 21 21 var href = location.href; 22 var lat = encodeURIComponent( pref.copyUnicharPref("msim.config.AU.gps.lat"));23 var lon = encodeURIComponent( pref.copyUnicharPref("msim.config.AU.gps.lon"));22 var lat = encodeURIComponent(msim_pref.copyUnicharPref("msim.config.AU.gps.lat")); 23 var lon = encodeURIComponent(msim_pref.copyUnicharPref("msim.config.AU.gps.lon")); 24 24 25 25 if(href.indexOf("device:location") == 0){ … … 31 31 var datum = params["datum"]; // 測地系 32 32 var unit = params["unit"]; // 緯度経度表記方法 33 var alt = pref.copyUnicharPref("msim.config.AU.gps.alt") || 50; //海抜高度33 var alt = msim_pref.copyUnicharPref("msim.config.AU.gps.alt") || 50; //海抜高度 34 34 var time = getYYYYMMDDHHmm(); 35 var smaj = pref.copyUnicharPref("msim.config.AU.gps.smaj") || 100; //長軸成分誤差36 var smin = pref.copyUnicharPref("msim.config.AU.gps.smin") || 100; //短軸成分誤差37 var vert = pref.copyUnicharPref("msim.config.AU.gps.vert") || 100; //高度誤差38 var majaa = pref.copyUnicharPref("msim.config.AU.gps.majaa") || 60; //長軸短軸傾き値35 var smaj = msim_pref.copyUnicharPref("msim.config.AU.gps.smaj") || 100; //長軸成分誤差 36 var smin = msim_pref.copyUnicharPref("msim.config.AU.gps.smin") || 100; //短軸成分誤差 37 var vert = msim_pref.copyUnicharPref("msim.config.AU.gps.vert") || 100; //高度誤差 38 var majaa = msim_pref.copyUnicharPref("msim.config.AU.gps.majaa") || 60; //長軸短軸傾き値 39 39 var fm = 1; //測位結果の精度 40 40 -
platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/html/dc_openiarea.js
r19719 r20183 28 28 29 29 var openiareaBody = document.getElementById("openiarea_body"); 30 var areaname = pref.copyUnicharPref("msim.config.DC.gps.areaname");31 var areacode = pref.copyUnicharPref("msim.config.DC.gps.areacode");32 var lat = pref.copyUnicharPref("msim.config.DC.gps.lat");33 var lon = pref.copyUnicharPref("msim.config.DC.gps.lon");30 var areaname = msim_pref.copyUnicharPref("msim.config.DC.gps.areaname"); 31 var areacode = msim_pref.copyUnicharPref("msim.config.DC.gps.areacode"); 32 var lat = msim_pref.copyUnicharPref("msim.config.DC.gps.lat"); 33 var lon = msim_pref.copyUnicharPref("msim.config.DC.gps.lon"); 34 34 35 35 if(!posinfo){ -
platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/options/dialogs/device.js
r19581 r20183 47 47 dump(carrier + "\n"); 48 48 dump(id + "\n"); 49 document.getElementById("msim.options.device.device").value = pref49 document.getElementById("msim.options.device.device").value = msim_pref 50 50 .copyUnicharPref("msim.devicelist." + carrier + "." + id 51 51 + ".device"); 52 52 document.getElementById("msim.options.device.carrier").value = carrierName[carrier]; 53 document.getElementById("msim.options.device.useragent").value = pref53 document.getElementById("msim.options.device.useragent").value = msim_pref 54 54 .copyUnicharPref("msim.devicelist." + carrier + "." + id 55 55 + ".useragent"); … … 94 94 t.setAttribute("size", 50); 95 95 if (id 96 && pref.copyUnicharPref("msim.devicelist." + carrier + "." + id96 && msim_pref.copyUnicharPref("msim.devicelist." + carrier + "." + id 97 97 + "." + a)) { 98 t.setAttribute("value", pref.copyUnicharPref("msim.devicelist."98 t.setAttribute("value", msim_pref.copyUnicharPref("msim.devicelist." 99 99 + carrier + "." + id + "." + a)); 100 100 } … … 125 125 // carrier = 126 126 // document.getElementById("msim.options.device.carrierlist").selectedItem.getAttribute("id"); 127 saveId = pref.getIntPref("msim.devicelist." + carrier + ".count")127 saveId = msim_pref.getIntPref("msim.devicelist." + carrier + ".count") 128 128 + 1; 129 pref.setIntPref("msim.devicelist." + carrier + ".count", saveId);130 pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId129 msim_pref.setIntPref("msim.devicelist." + carrier + ".count", saveId); 130 msim_pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId 131 131 + ".carrier", carrier); 132 132 } else { … … 148 148 return false; 149 149 } 150 pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId150 msim_pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId 151 151 + ".device", deviceName); 152 pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId152 msim_pref.setUnicharPref("msim.devicelist." + carrier + "." + saveId 153 153 + ".useragent", userAgent); 154 154 … … 163 163 dump("getvalue:" + elementId + ":" 164 164 + document.getElementById(elementId).value + "\n"); 165 pref165 msim_pref 166 166 .setUnicharPref("msim.devicelist." + carrier + "." + saveId 167 167 + "." + a, document -
platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/options/options.js
r19581 r20183 37 37 var prefPrefix = "msim.devicelist." + carrier + "." + deletedId + "." 38 38 for(var i=0; i<deviceBasicAttribute.length; i++){ 39 pref.deletePref(prefPrefix+deviceBasicAttribute[i]);39 msim_pref.deletePref(prefPrefix+deviceBasicAttribute[i]); 40 40 } 41 41 for(var i=0; i<deviceAttribute[carrier].length; i++){ 42 pref.deletePref(prefPrefix+deviceAttribute[carrier][i]);42 msim_pref.deletePref(prefPrefix+deviceAttribute[carrier][i]); 43 43 } 44 44 45 45 //既に使われている端末だったら設定をリセット 46 if( pref.copyUnicharPref("msim.current.id") == deletedId &&pref.copyUnicharPref("msim.current.carrier") == carrier){46 if(msim_pref.copyUnicharPref("msim.current.id") == deletedId && msim_pref.copyUnicharPref("msim.current.carrier") == carrier){ 47 47 dump("[msim]Debug : This device is used. Reset your settings.\n"); 48 pref.deletePref("msim.current.carrier");49 pref.deletePref("msim.current.device");50 pref.deletePref("general.useragent.override");51 pref.deletePref("msim.current.useragent");52 pref.deletePref("msim.current.id");48 msim_pref.deletePref("msim.current.carrier"); 49 msim_pref.deletePref("msim.current.device"); 50 msim_pref.deletePref("general.useragent.override"); 51 msim_pref.deletePref("msim.current.useragent"); 52 msim_pref.deletePref("msim.current.id"); 53 53 } 54 54 55 55 //各端末のidを再計算 56 var count = pref.getIntPref("msim.devicelist." + carrier + ".count");56 var count = msim_pref.getIntPref("msim.devicelist." + carrier + ".count"); 57 57 dump(deletedId+":"+count+"\n"); 58 58 dump((deletedId+1)+":"+count+"\n"); … … 62 62 var ePrefPrefix = "msim.devicelist." + carrier + "." + (i-1) + "."; 63 63 for(var j=0; j<deviceBasicAttribute.length; j++){ 64 pref.setUnicharPref(ePrefPrefix+deviceBasicAttribute[j],pref.copyUnicharPref(sPrefPrefix+deviceBasicAttribute[j]));64 msim_pref.setUnicharPref(ePrefPrefix+deviceBasicAttribute[j], msim_pref.copyUnicharPref(sPrefPrefix+deviceBasicAttribute[j])); 65 65 } 66 66 for(var j=0; j<deviceAttribute[carrier].length; j++){ 67 pref.setUnicharPref(ePrefPrefix+deviceAttribute[carrier][j],pref.copyUnicharPref(sPrefPrefix+deviceAttribute[carrier][j]));68 } 69 } 70 pref.setIntPref("msim.devicelist." + carrier + ".count", count-1);67 msim_pref.setUnicharPref(ePrefPrefix+deviceAttribute[carrier][j], msim_pref.copyUnicharPref(sPrefPrefix+deviceAttribute[carrier][j])); 68 } 69 } 70 msim_pref.setIntPref("msim.devicelist." + carrier + ".count", count-1); 71 71 72 72 deviceBox.removeChild(selectedItem); … … 84 84 var id = selectedItem.getAttribute("id"); 85 85 if(window.openDialog("chrome://msim/content/options/dialogs/device.xul", "msim-device-dialog", "centerscreen,chrome,modal,resizable", "edit", carrier, id, retVals)){ 86 setDevice(carrier, id); 86 if(retVals.id && retVals.carrier){ 87 //既に使われている端末だったら設定をリセット 88 if(msim_pref.copyUnicharPref("msim.current.id") == retVals.id && msim_pref.copyUnicharPref("msim.current.carrier") == retVals.carrier){ 89 setDevice(retVals.carrier, retVals.id); 90 } 91 } 87 92 } 88 93 }else{ … … 111 116 { 112 117 var pageDocument = document.getElementById("msim-options-iframe").contentDocument; 113 pageDocument.getElementById("msim-textbox-docomo-uid").setAttribute("value", pref.copyUnicharPref("msim.config.DC.uid"));114 pageDocument.getElementById("msim-textbox-docomo-ser").setAttribute("value", pref.copyUnicharPref("msim.config.DC.ser"));115 pageDocument.getElementById("msim-textbox-docomo-icc").setAttribute("value", pref.copyUnicharPref("msim.config.DC.icc"));116 pageDocument.getElementById("msim-textbox-docomo-guid").setAttribute("value", pref.copyUnicharPref("msim.config.DC.guid"));117 pageDocument.getElementById("msim-textbox-au-uid").setAttribute("value", pref.copyUnicharPref("msim.config.AU.uid"));118 pageDocument.getElementById("msim-textbox-softbank-uid").setAttribute("value", pref.copyUnicharPref("msim.config.SB.uid"));119 pageDocument.getElementById("msim-textbox-softbank-serial").setAttribute("value", pref.copyUnicharPref("msim.config.SB.serial"));118 pageDocument.getElementById("msim-textbox-docomo-uid").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.uid")); 119 pageDocument.getElementById("msim-textbox-docomo-ser").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.ser")); 120 pageDocument.getElementById("msim-textbox-docomo-icc").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.icc")); 121 pageDocument.getElementById("msim-textbox-docomo-guid").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.guid")); 122 pageDocument.getElementById("msim-textbox-au-uid").setAttribute("value",msim_pref.copyUnicharPref("msim.config.AU.uid")); 123 pageDocument.getElementById("msim-textbox-softbank-uid").setAttribute("value",msim_pref.copyUnicharPref("msim.config.SB.uid")); 124 pageDocument.getElementById("msim-textbox-softbank-serial").setAttribute("value",msim_pref.copyUnicharPref("msim.config.SB.serial")); 120 125 } 121 126 … … 135 140 var carrier = carrierArray[j]; 136 141 137 deviceCount = pref.getIntPref("msim.devicelist." + carrier + ".count");142 deviceCount = msim_pref.getIntPref("msim.devicelist." + carrier + ".count"); 138 143 for(var i = 1; i <= deviceCount; i++){ 139 var device = pref.copyUnicharPref("msim.devicelist." + carrier + "." + i + ".device");140 var useragent = pref.copyUnicharPref("msim.devicelist." + carrier + "." + i + ".useragent");144 var device = msim_pref.copyUnicharPref("msim.devicelist." + carrier + "." + i + ".device"); 145 var useragent = msim_pref.copyUnicharPref("msim.devicelist." + carrier + "." + i + ".useragent"); 141 146 if(device){ 142 147 var listItem = deviceBox.appendItem(carrier + ":" + device, useragent); … … 160 165 // Loop through the boolean options 161 166 for(option in msim_optionsDataBoolean){ 162 pref.setBoolPref(option, msim_optionsDataBoolean[option]);167 msim_pref.setBoolPref(option, msim_optionsDataBoolean[option]); 163 168 } 164 169 165 170 // Loop through the integer options 166 171 for(option in msim_optionsDataInteger){ 167 pref.setIntPref(option, msim_optionsDataInteger[option]);172 msim_pref.setIntPref(option, msim_optionsDataInteger[option]); 168 173 } 169 174 170 175 // Loop through the string options 171 176 for(option in msim_optionsDataString){ 172 pref.setUnicharPref(option, msim_optionsDataString[option]);177 msim_pref.setUnicharPref(option, msim_optionsDataString[option]); 173 178 } 174 179 } … … 190 195 msim_optionsDataString["msim.config.SB.uid"] = pageDocument.getElementById("msim-textbox-softbank-uid").value; 191 196 msim_optionsDataString["msim.config.SB.serial"] = pageDocument.getElementById("msim-textbox-softbank-serial").value; 192 var carrier = pref.copyUnicharPref("msim.current.carrier");197 var carrier = msim_pref.copyUnicharPref("msim.current.carrier"); 193 198 if(carrier == SOFTBANK){ 194 199 dump("[msim]Debug : Current Carrier is SoftBank. Replace User-Agent.\n"); 195 var id = pref.copyUnicharPref("msim.current.id");196 var useragent = pref.copyUnicharPref("msim.devicelist."+carrier+"."+id+".useragent");200 var id = msim_pref.copyUnicharPref("msim.current.id"); 201 var useragent = msim_pref.copyUnicharPref("msim.devicelist."+carrier+"."+id+".useragent"); 197 202 var newUserAgent = getSoftBankUserAgent(useragent, msim_optionsDataString["msim.config.SB.serial"]); 198 203 msim_optionsDataString["general.useragent.override"] = newUserAgent; … … 237 242 var carrier = carrierArray[i]; 238 243 dump("target carrier is "+carrier+"\n"); 239 pref.deletePref("msim.devicelist." + carrier + ".count");240 var count = pref.getIntPref("msim.devicelist." + carrier + ".count");244 msim_pref.deletePref("msim.devicelist." + carrier + ".count"); 245 var count = msim_pref.getIntPref("msim.devicelist." + carrier + ".count"); 241 246 for(var j=1; j<=count; j++){ 242 247 var prefPrefix = "msim.devicelist." + carrier + "." + j + "."; … … 244 249 dump("target prefix is "+prefPrefix+"\n"); 245 250 for(var k=0; k<deviceBasicAttribute.length; k++){ 246 pref.deletePref(prefPrefix+deviceBasicAttribute[k]);251 msim_pref.deletePref(prefPrefix+deviceBasicAttribute[k]); 247 252 } 248 253 for(var k=0; k<deviceAttribute[carrier].length; k++){ 249 pref.deletePref(prefPrefix+deviceAttribute[carrier][k]);254 msim_pref.deletePref(prefPrefix+deviceAttribute[carrier][k]); 250 255 } 251 256 } 252 257 } 253 258 254 pref.deletePref("msim.current.carrier");255 pref.deletePref("msim.current.device");256 pref.deletePref("general.useragent.override");257 pref.deletePref("msim.current.useragent");258 pref.deletePref("msim.current.id");259 msim_pref.deletePref("msim.current.carrier"); 260 msim_pref.deletePref("msim.current.device"); 261 msim_pref.deletePref("general.useragent.override"); 262 msim_pref.deletePref("msim.current.useragent"); 263 msim_pref.deletePref("msim.current.id"); 259 264 260 265 //TODO:ツールバー上のiconをupdate … … 268 273 function msim_initializeGps(){ 269 274 var pageDocument = document.getElementById("msim-options-iframe").contentDocument; 270 pageDocument.getElementById("msim-textbox-docomo-gps-areacode").setAttribute("value", pref.copyUnicharPref("msim.config.DC.gps.areacode"));271 pageDocument.getElementById("msim-textbox-docomo-gps-areaname").setAttribute("value", pref.copyUnicharPref("msim.config.DC.gps.areaname"));272 pageDocument.getElementById("msim-textbox-docomo-gps-lat").setAttribute("value", pref.copyUnicharPref("msim.config.DC.gps.lat"));273 pageDocument.getElementById("msim-textbox-docomo-gps-lon").setAttribute("value", pref.copyUnicharPref("msim.config.DC.gps.lon"));274 pageDocument.getElementById("msim-textbox-docomo-gps-alt").setAttribute("value", pref.copyUnicharPref("msim.config.DC.gps.alt"));275 pageDocument.getElementById("msim-textbox-au-gps-lat").setAttribute("value", pref.copyUnicharPref("msim.config.AU.gps.lat"));276 pageDocument.getElementById("msim-textbox-au-gps-lon").setAttribute("value", pref.copyUnicharPref("msim.config.AU.gps.lon"));275 pageDocument.getElementById("msim-textbox-docomo-gps-areacode").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.areacode")); 276 pageDocument.getElementById("msim-textbox-docomo-gps-areaname").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.areaname")); 277 pageDocument.getElementById("msim-textbox-docomo-gps-lat").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.lat")); 278 pageDocument.getElementById("msim-textbox-docomo-gps-lon").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.lon")); 279 pageDocument.getElementById("msim-textbox-docomo-gps-alt").setAttribute("value",msim_pref.copyUnicharPref("msim.config.DC.gps.alt")); 280 pageDocument.getElementById("msim-textbox-au-gps-lat").setAttribute("value",msim_pref.copyUnicharPref("msim.config.AU.gps.lat")); 281 pageDocument.getElementById("msim-textbox-au-gps-lon").setAttribute("value",msim_pref.copyUnicharPref("msim.config.AU.gps.lon")); 277 282 } 278 283 … … 280 285 dump("[msim]initializePictogram.\n"); 281 286 var pageDocument = document.getElementById("msim-options-iframe").contentDocument; 282 pageDocument.getElementById("msim-textbox-docomo-pictogram-enabled").checked = pref.getBoolPref("msim.config.DC.pictogram.enabled");283 pageDocument.getElementById("msim-textbox-au-pictogram-enabled").checked = pref.getBoolPref("msim.config.AU.pictogram.enabled");284 pageDocument.getElementById("msim-textbox-softbank-pictogram-enabled").checked = pref.getBoolPref("msim.config.SB.pictogram.enabled");285 } 287 pageDocument.getElementById("msim-textbox-docomo-pictogram-enabled").checked = msim_pref.getBoolPref("msim.config.DC.pictogram.enabled"); 288 pageDocument.getElementById("msim-textbox-au-pictogram-enabled").checked = msim_pref.getBoolPref("msim.config.AU.pictogram.enabled"); 289 pageDocument.getElementById("msim-textbox-softbank-pictogram-enabled").checked = msim_pref.getBoolPref("msim.config.SB.pictogram.enabled"); 290 } -
platform/firefox/FireMobileSimulator/branches/0.1.4.X/src/chrome/content/overlay.js
r19722 r20183 38 38 } 39 39 40 var initialized = pref.getBoolPref("msim.config.initialized");40 var initialized = msim_pref.getBoolPref("msim.config.initialized"); 41 41 if (!initialized) { 42 42 // 何か初期化処理をしたい場合はここに記載 43 // pref.setBoolPref("msim.config.initialized", true);43 // msim_pref.setBoolPref("msim.config.initialized", true); 44 44 } 45 45 this.updateIcon(); … … 90 90 for (var j = 0; j < carrierArray.length; j++) { 91 91 var carrier = carrierArray[j]; 92 var deviceCount = pref.getIntPref("msim.devicelist." + carrier92 var deviceCount = msim_pref.getIntPref("msim.devicelist." + carrier 93 93 + ".count"); 94 94 for (var i = 1; i <= deviceCount; i++) { 95 95 var menuItem = document.createElement("menuitem"); 96 96 97 var device = pref.copyUnicharPref("msim.devicelist." + carrier97 var device = msim_pref.copyUnicharPref("msim.devicelist." + carrier 98 98 + "." + i + ".device"); 99 var useragent = pref.copyUnicharPref("msim.devicelist."99 var useragent = msim_pref.copyUnicharPref("msim.devicelist." 100 100 + carrier + "." + i + ".useragent"); 101 101 … … 114 114 115 115 var currentMenuId = "msim-device-" + suffix + "-" 116 + pref.copyUnicharPref("msim.current.carrier") + "-"117 + pref.copyUnicharPref("msim.current.id");116 + msim_pref.copyUnicharPref("msim.current.carrier") + "-" 117 + msim_pref.copyUnicharPref("msim.current.id"); 118 118 var currentMenu = document.getElementById(currentMenuId); 119 119 if (!currentMenu) { … … 149 149 msim_resetDevice : function(e) { 150 150 dump("[msim]resetDevice.\n"); 151 pref.deletePref("msim.current.carrier");152 pref.deletePref("msim.current.device");153 pref.deletePref("general.useragent.override");154 pref.deletePref("msim.current.useragent");155 pref.deletePref("msim.current.id");151 msim_pref.deletePref("msim.current.carrier"); 152 msim_pref.deletePref("msim.current.device"); 153 msim_pref.deletePref("general.useragent.override"); 154 msim_pref.deletePref("msim.current.useragent"); 155 msim_pref.deletePref("msim.current.id"); 156 156 157 157 this.updateIcon(); … … 170 170 msim_BrowserOnLoad : function(objEvent) { 171 171 172 var carrier = pref.copyUnicharPref("msim.current.carrier");172 var carrier = msim_pref.copyUnicharPref("msim.current.carrier"); 173 173 174 174 if (carrier) { … … 240 240 } 241 241 242 var pictogramConverterEnabled = pref.getBoolPref("msim.config."+carrier+".pictogram.enabled")242