Changeset 27324

Timestamp:

12/24/08 03:38:18 (4 years ago)

Author:

thorikawa

Message:

*someやletがFirefox2.0.0.3で動作しないので戻しました。

Files:

• platform/firefox/FireMobileSimulator/trunk/src/chrome/content/core.js (modified) (8 diffs)

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

@@ -73 +73 @@
         //各端末のidを再計算
         var count = firemobilesimulator.common.pref.getIntPref("msim.devicelist.count");
-        for (let i=deletedId+1; i<=count; i++) {
-                let sPrefPrefix = "msim.devicelist." + i + ".";
-                let ePrefPrefix = "msim.devicelist." + (i-1) + ".";
+        for (var i=deletedId+1; i<=count; i++) {
+                var sPrefPrefix = "msim.devicelist." + i + ".";
+                var ePrefPrefix = "msim.devicelist." + (i-1) + ".";
                 firemobilesimulator.common.carrier.deviceBasicAttribute.forEach(function(attribute) {
                         if (attribute == "extra-header") {
-                                let extraHeaders = firemobilesimulator.common.pref.getListPref(sPrefPrefix + "extra-header", ["name", "value"]);
+                                var extraHeaders = firemobilesimulator.common.pref.getListPref(sPrefPrefix + "extra-header", ["name", "value"]);
                                 extraHeaders.forEach(function(extraHeader) {
                                         if (extraHeader.value) {
@@ -104 +104 @@
 
         while (windowEnumeration.hasMoreElements()) {
-                let windowObj = windowEnumeration.getNext();
-                let msimButton = windowObj.document.getElementById("msim-button");
-                let menu = windowObj.document.getElementById("msim-menu");
-                let target = [msimButton, menu];
+                var windowObj = windowEnumeration.getNext();
+                var msimButton = windowObj.document.getElementById("msim-button");
+                var menu = windowObj.document.getElementById("msim-menu");
+                var target = [msimButton, menu];
                 target.forEach(function(item) {
                         if (item) {
-                                let id = firemobilesimulator.common.pref.copyUnicharPref("msim.current.id");
+                                var id = firemobilesimulator.common.pref.copyUnicharPref("msim.current.id");
                                 if (!id) {
                                         item.removeAttribute("device");
@@ -157 +157 @@
                 firemobilesimulator.common.carrier.deviceBasicAttribute.forEach(function(key) {
                         if (key == "extra-header") {
-                                let headerResults = xPathEvaluator.evaluate("ExtraHeaders/Header",
+                                var headerResults = xPathEvaluator.evaluate("ExtraHeaders/Header",
                                                 deviceElement, resolver,
                                                 XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
-                                let headerElement = null;
+                                var headerElement = null;
 
                                 //ExtraHeaderエレメントの取得
-                                let headers = new Array();
-                                let j = 0;
+                                var headers = new Array();
+                                var j = 0;
                                 while ((headerElement = headerResults.iterateNext()) != null) {
-                                        let name = xPathEvaluator.evaluate("Name", headerElement, resolver,
+                                        var name = xPathEvaluator.evaluate("Name", headerElement, resolver,
                                                         XPathResult.STRING_TYPE, null).stringValue;
-                                        let value = xPathEvaluator.evaluate("Value", headerElement,
+                                        var value = xPathEvaluator.evaluate("Value", headerElement,
                                                         resolver, XPathResult.STRING_TYPE, null).stringValue;
                                         headers[j] = {
@@ -178 +178 @@
                                 devices[i]["headers"] = headers;
                         } else {
-                                let tagName = firemobilesimulator.common.carrier.xmlTagName[key];
-                                let value = xPathEvaluator.evaluate(tagName, deviceElement,
+                                var tagName = firemobilesimulator.common.carrier.xmlTagName[key];
+                                var value = xPathEvaluator.evaluate(tagName, deviceElement,
                                                 resolver, XPathResult.STRING_TYPE, null).stringValue;
                                 if (tagName == "Carrier") {
@@ -202 +202 @@
                 var id = ++currentId;
                 var carrier = device.carrier;
-                for (let key in device) {
-                        let value = device[key];
+                for (var key in device) {
+                        var value = device[key];
                         if (key == "headers") {
-                                let i = 1;
+                                var i = 1;
                                 value.forEach(function(header) {
                                         firemobilesimulator.common.pref.setUnicharPref(
@@ -240 +240 @@
 
 firemobilesimulator.core.isValidCarrier = function(carrierCode) {
-        return firemobilesimulator.common.carrier.carrierArray.some(function(c) carrierCode == c);
+        var result = false;
+        firemobilesimulator.common.carrier.carrierArray.forEach(function(c) {
+                if (carrierCode == c) {
+                        result = true;
+                }
+        });
+        return result;
 };
 
@@ -246 +252 @@
         var deviceCount = firemobilesimulator.common.pref.getIntPref("msim.devicelist.count");
         firemobilesimulator.core.deviceIdArray = new Array();
-        for (let i = 1; i <= deviceCount; i++) {
-                let deviceId = firemobilesimulator.common.pref.copyUnicharPref("msim.devicelist." + i + ".device-id");
+        for (var i = 1; i <= deviceCount; i++) {
+                var deviceId = firemobilesimulator.common.pref.copyUnicharPref("msim.devicelist." + i + ".device-id");
                 if(deviceId) {
                         firemobilesimulator.core.deviceIdArray.push(deviceId);
@@ -262 +268 @@
 
 firemobilesimulator.core.isRegistered = function(deviceId, refreshFlag) {
-        return firemobilesimulator.core.getRegisteredDevices().some(function(_deviceId) {
-                return _deviceId == deviceId;
-        });
+        var result = false;
+        firemobilesimulator.core.getRegisteredDevices().forEach(function(_deviceId) {
+                if (_deviceId == deviceId) {
+                        result = true;
+                }
+        });
+        return result;
 };
 
 firemobilesimulator.core.clearAllDevice = function() {
         var count = firemobilesimulator.common.pref.getIntPref("msim.devicelist.count");
-        for (let i = 1; i <= count; i++) {
-                let prefPrefix = "msim.devicelist." + i + ".";
+        for (var i = 1; i <= count; i++) {
+                var prefPrefix = "msim.devicelist." + i + ".";
 
                 firemobilesimulator.common.carrier.deviceBasicAttribute.forEach(function(attribute) {