Changeset 23139

Timestamp:

11/10/08 20:11:32 (5 years ago)

Author:

thorikawa

Message:

bug fix and refactoring.

Location:

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

Files:

• dialogs/device.js (modified) (2 diffs)
• dialogs/device.xul (modified) (2 diffs)
• options.js (modified) (3 diffs)

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

@@ -193 +193 @@
 };
 
-firemobilesimulator.options.dialogs.device.appendExtraHeaderRows = function(
-                targetNode, id) {
-        dump("[msim]append:" + targetNode + ":" + id + "\n");
+firemobilesimulator.options.dialogs.device.appendExtraHeaderRows = function(targetNode, id) {
         var extraHeaders = firemobilesimulator.common.pref.getListPref(
                         "msim.devicelist." + id + ".extra-header", ["name",
@@ -201 +199 @@
         extraHeaders.forEach(function(extraHeader) {
                 if (id && extraHeader.value) {
-                        var r = document.createElement("row");
-                        var l = document.createElement("textbox");
-                        var t = document.createElement("textbox");
-                        var b = document.createElement("button");
-                        r.setAttribute("align", "center");
-                        l.setAttribute("size", 50);
-                        l.setAttribute("value", extraHeader.name);
-                        t.setAttribute("size", 50);
-                        t.setAttribute("value", extraHeader.value);
-                        // TODO propertieファイルから取得するように修正
-                        b.setAttribute("label", "削除");
-                        b.setAttribute("oncommand",
-                                        "this.parentNode.parentNode.removeChild(this.parentNode);");
-                        r.appendChild(l);
-                        r.appendChild(t);
-                        r.appendChild(b);
-                        targetNode.appendChild(r);
+                        firemobilesimulator.options.dialogs.device.addExtraHeaderRow(targetNode, extraHeader);
                 }
         });
 };
 
-firemobilesimulator.options.dialogs.device.addExtraHeaderRow = function(
-                targetNode) {
+firemobilesimulator.options.dialogs.device.addExtraHeaderRow = function(targetNode, headerObj) {
         var r = document.createElement("row");
         var l = document.createElement("textbox");
         var t = document.createElement("textbox");
         var b = document.createElement("button");
+        var h = document.createElement("hbox");
         r.setAttribute("align", "center");
         l.setAttribute("size", 50);
+        if(headerObj && headerObj.name) l.setAttribute("value", headerObj.name);
         t.setAttribute("size", 50);
+        if(headerObj && headerObj.value) t.setAttribute("value", headerObj.value);
         // TODO propertieファイルから取得するように修正
         b.setAttribute("label", "削除");
-        b.setAttribute("oncommand",
-                        "this.parentNode.parentNode.removeChild(this.parentNode);");
+        b.setAttribute("oncommand",     "this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);");
+        h.appendChild(t);
+        h.appendChild(b);
         r.appendChild(l);
-        r.appendChild(t);
-        r.appendChild(b);
+        r.appendChild(h);
         targetNode.appendChild(r);
 };

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

@@ -27 +27 @@
                 <rows id="msim.options.device.rows">
                         <row align="center">
-                                <label control="msim.options.device.label" value="&msim.options.device.device;"/>
+                                <label control="msim.options.device.label" value="&msim.options.device.device;" width="50"/>
                                 <textbox id="msim.options.device.label" size="50"/>
                         </row>
                         <row id="msim.options.device.carrier.row" align="center">
-                                <label control="msim.options.device.carrier" value="&msim.options.device.carrier;"/>
+                                <label control="msim.options.device.carrier" value="&msim.options.device.carrier;" size="50"/>
                                 <!--<textbox id="msim.options.device.carrier" size="50" disabled="true"/>-->
                         </row>
                         <row id="msim.options.device.useragent.row" align="center">
-                                <label control="msim.options.device.useragent" value="&msim.options.device.useragent;"/>
+                                <label control="msim.options.device.useragent" value="&msim.options.device.useragent;" size="50"/>
                                 <textbox id="msim.options.device.useragent" size="50"/>
                         </row>
                         <row id="msim.options.device.screen-width.row" align="center">
-                                <label control="msim.options.device.screen-width" value="&msim.options.device.screen-width;"/>
+                                <label control="msim.options.device.screen-width" value="&msim.options.device.screen-width;"  size="50"/>
                                 <textbox id="msim.options.device.screen-width" size="50"/>
                         </row>
                         <row id="msim.options.device.screen-height.row" align="center">
-                                <label control="msim.options.device.screen-height" value="&msim.options.device.screen-height;"/>
+                                <label control="msim.options.device.screen-height" value="&msim.options.device.screen-height;" size="50"/>
                                 <textbox id="msim.options.device.screen-height" size="50"/>
                         </row>
@@ -57 +57 @@
                         </columns>
                         <rows id="msim.options.device.extra-headers.rows">
+                                <row align="center">
+                                        <label value="header-name" width="50"/>
+                                        <label value="header-value" width="50"/>
+                                </row>
                         </rows>
                 </grid>
-                <button id="msim.options.device.extra-headers.add" label="&msim.options.device.extra-headers.add;" oncommand="firemobilesimulator.options.dialogs.device.addExtraHeaderRow(document.getElementById('msim.options.device.extra-headers.rows'));window.sizeToContent();" accesskey="x"/>
+                <button id="msim.options.device.extra-headers.add" label="&msim.options.device.extra-headers.add;" oncommand="firemobilesimulator.options.dialogs.device.addExtraHeaderRow(document.getElementById('msim.options.device.extra-headers.rows'));window.sizeToContent();" accesskey="x" width="50"/>
     </groupbox>
     

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

@@ -424 +424 @@
                                 }else{
                                         var tagName = firemobilesimulator.common.carrier.xmlTagName[key];
+                                        dump("key:"+key+"\n");
+                                        dump("tagName:"+tagName+"\n");
                                         if(tagName){
+                                                dump("createelement.\n")
                                                 var value = firemobilesimulator.common.pref.copyUnicharPref("msim.devicelist." + i + "." + key);
+                                                dump("msim.devicelist." + i + "." + key+"\n");
                                                 var ele = xmlDocument.createElement(tagName);
                                                 ele.appendChild(xmlDocument.createTextNode(value));
@@ -520 +524 @@
                 currentId++;
                 var id = currentId;
-                devoce[i]["id"] = id;
+                devices[i] = {};
+                devices[i]["id"] = id;
                 firemobilesimulator.common.carrier.deviceBasicAttribute.forEach(function(key){
                         if(key == "extra-header"){
@@ -542 +547 @@
                                         j++;
                                 }
-                                devoce[i]["headers"] = headers;
+                                devices[i]["headers"] = headers;
                         }else{
                                 var tagName = firemobilesimulator.common.carrier.xmlTagName[key];