Changeset 20347 for platform

Timestamp:

10/01/08 10:51:01 (7 weeks ago)

Author:

thorikawa

Message:

端末が削除できないバグfix

Files:

• platform/firefox/FireMobileSimulator/trunk/src/chrome/content/options/options.js (modified) (10 diffs)

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

@@ -55 +55 @@
         var deviceBox    = pageDocument.getElementById("msim-listbox");
         var selectedItem = deviceBox.selectedItem;
-        if(selectedItem && confirm(document.getElementById("msim-string-bundle").getString("firemobilesimulator.options.deleteConfirmation"))){
+        if(selectedItem && confirm(document.getElementById("msim-string-bundle").getString("msim_deleteConfirmation"))){
                 var carrier = selectedItem.getAttribute("carrier");
                 var deletedId = parseInt(selectedItem.getAttribute("id"));
                 var prefPrefix = "msim.devicelist." + carrier + "." + deletedId + "."
-                deviceBasicAttribute.concat(deviceAttribute[carrier]).forEach(function(attribute){
+                firemobilesimulator.common.carrier.deviceBasicAttribute.concat(firemobilesimulator.common.carrier.deviceAttribute[carrier]).forEach(function(attribute){
                         firemobilesimulator.common.pref.deletePref(prefPrefix+attribute);
                 });
@@ -65 +65 @@
                 //既に使われている端末だったら設定をリセット
                 if(firemobilesimulator.common.pref.copyUnicharPref("msim.current.id") == deletedId && firemobilesimulator.common.pref.copyUnicharPref("msim.current.carrier") == carrier){
-                        firemobilesimulator.options.core.resetDevice();
+                        firemobilesimulator.core.resetDevice();
                 }
 
@@ -76 +76 @@
                         var sPrefPrefix = "msim.devicelist." + carrier + "." + i + ".";
                         var ePrefPrefix = "msim.devicelist." + carrier + "." + (i-1) + ".";
-                        deviceBasicAttribute.contcat(deviceAttribute[carrier]).forEach(function(attribute){
+                        firemobilesimulator.common.carrier.deviceBasicAttribute.contcat(firemobilesimulator.common.carrier.deviceAttribute[carrier]).forEach(function(attribute){
                                 firemobilesimulator.common.pref.setUnicharPref(ePrefPrefix+attribute, firemobilesimulator.common.pref.copyUnicharPref(sPrefPrefix+attribute));
                         });
@@ -109 +109 @@
 
 // Initializes the options dialog box
-firemobilesimulator.options.initializeOptions = function(){
+firemobilesimulator.options.initializeOptions = function()
+{
         var selectedPage = document.getElementById("msim-page-list").selectedItem.getAttribute("value");
 
@@ -124 +125 @@
                 firemobilesimulator.options.initializePictogram();
         }
-}
+};
 
 // Initializes the general page
-firemobilesimulator.options.initializeGeneral = function(){
+firemobilesimulator.options.initializeGeneral = function()
+{
         var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
         pageDocument.getElementById("msim-checkbox-general-force-screen-width").checked = firemobilesimulator.common.pref.getBoolPref("msim.config.general.force-screen-width");
@@ -134 +136 @@
 
 // Initializes the general page
-firemobilesimulator.options.initializeIdno = function(){
+firemobilesimulator.options.initializeIdno = function()
+{
         var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
         pageDocument.getElementById("msim-textbox-docomo-uid").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.DC.uid"));
@@ -271 +274 @@
 
                                 dump("target firemobilesimulator.common.pref.x is "+prefPrefix+"\n");
-                                deviceBasicAttribute.concat(deviceAttribute[carrier]).forEach(function(attribute){
+                                firemobilesimulator.common.carrier.deviceBasicAttribute.concat(firemobilesimulator.common.carrier.deviceAttribute[carrier]).forEach(function(attribute){
                                         firemobilesimulator.common.pref.deletePref(prefPrefix+attribute);
                                 });
@@ -282 +285 @@
                 firemobilesimulator.common.pref.deletePref("msim.current.useragent");
                 firemobilesimulator.common.pref.deletePref("msim.current.id");
-
-                //TODO:ツールバー上のiconをupdate
-                //parent.msim.resetDevice();
+                firemobilesimulator.core.resetDevice();
         }
 
@@ -291 +292 @@
 
 // Initializes the general page
-firemobilesimulator.options.initializeGps = function(){
+firemobilesimulator.options.initializeGps = function()
+{
         var pageDocument = document.getElementById("msim-options-iframe").contentDocument;
         pageDocument.getElementById("msim-textbox-docomo-gps-areacode").setAttribute("value",firemobilesimulator.common.pref.copyUnicharPref("msim.config.DC.gps.areacode"));
@@ -302 +304 @@
 };
 
-firemobilesimulator.options.initializePictogram = function(){
+firemobilesimulator.options.initializePictogram = function()
+{
         dump("[msim]initializePictogram.\n");
         var pageDocument = document.getElementById("msim-options-iframe").contentDocument;