Changeset 018766

Timestamp:

Nov 26, 2011, 8:37:07 PM (9 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

45adef

Parents:

826c34

Message:

another set of global pollution preventing (never ending story)

Files:

• content/bindings/v_identity.xml (modified) (6 diffs)
• content/vI_rdfDataEditor.js (modified) (4 diffs)
• content/vI_rdfDataEditor.xul (modified) (2 diffs)
• content/vI_rdfDataEditor_dataExtrasOverlay.xul (modified) (1 diff)
• content/vI_statusmenu.js (modified) (1 diff)
• skin/v_identity.css (modified) (1 diff)

content/bindings/v_identity.xml

@@ -135 +135 @@
         this.smtp = this._identityDataStorage.smtp.value;
         virtualIdentityExtension.MyLog.debug("** v_identity.xml fromPopupItem_clone constructor smtp='" + this.smtp + "'.\n")
-        this.smtpStyle = "width:" + document.getElementById("smtp_server_list").clientWidth + "px;";
+        this.smtpStyle = "width:" + document.getElementById("virtualIdentityExtension_SmtpServerList").clientWidth + "px;";
         this._identityDataStorage.smtp.value;
         
@@ -169 +169 @@
     <content sizetopopup="pref">
         <xul:hbox id="smtpServerHbox" class="smtpServerHbox">
-            <xul:menulist class="smtpServerMenuList" anonid="smtpServerMenuList" allowevents="true" id="smtp_server_list">
-                <xul:menupopup anonid="smtp_server_list_popup" />
+            <xul:menulist class="smtpServerMenuList" anonid="smtpServerMenuList" allowevents="true" id="virtualIdentityExtension_SmtpServerList">
+                <xul:menupopup anonid="virtualIdentityExtension_SmtpServerList_popup" />
             </xul:menulist>
-            <xul:checkbox  id="saveSMTPSwitch" class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.vIprefs.set('storage_store_SMTP', this.checked);" >
+            <xul:checkbox  id="virtualIdentityExtension_SaveSmtpSwitch" class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.vIprefs.set('storage_store_SMTP', this.checked);" >
                 <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="checked" />
                 <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="disabled" />
@@ -263 +263 @@
         ]]></setter>
     </property>
-    <field name="_smtpPopup">document.getAnonymousElementByAttribute(this, "anonid", "smtp_server_list_popup")</field>
+    <field name="_smtpPopup">document.getAnonymousElementByAttribute(this, "anonid", "virtualIdentityExtension_SmtpServerList_popup")</field>
     <field name="_smtpMenu">document.getAnonymousElementByAttribute(this, "anonid", "smtpServerMenuList")</field>
     <field name="_smtpService"></field>
@@ -291 +291 @@
                     crop="right" highlightnonmatches="true"/>
                 <xul:spacer flex="1" /></xul:vbox>
-                <xul:vbox id="saveSwitch"><xul:spacer flex="1" />
+                <xul:vbox id="virtualIdentityExtension_saveSwitch"><xul:spacer flex="1" />
                     <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.vIprefs.set('storage_store', this.checked);" >
                         <xul:observes element="virtualIdentityExtension_statusMenu_storage_save" attribute="checked" />
@@ -308 +308 @@
                     </xul:hbox>
                 <xul:spacer flex="1" /></xul:vbox>
-                <xul:vbox id="saveBaseIDSwitch"><xul:spacer flex="1" />
+                <xul:vbox id="virtualIdentityExtension_saveBaseIDSwitch"><xul:spacer flex="1" />
                     <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.vIprefs.set('storage_store_base_id', this.checked);" >
                         <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="checked" />
@@ -600 +600 @@
         for (var j = 0; j < MenuItems.length; j++) {
             if (MenuItems[j].localName == "menuseparator") continue;
-            MenuItems[j].smtpStyle = "width:" + document.getElementById("smtp_server_list").clientWidth + "px;";
+            MenuItems[j].smtpStyle = "width:" + document.getElementById("virtualIdentityExtension_SmtpServerList").clientWidth + "px;";
         }
     ]]></method>

content/vI_rdfDataEditor.js

@@ -40 +40 @@
         var listitem = document.createElement("menuitem");
         listitem.setAttribute("label", "");
-        document.getElementById("identity_list_popup").appendChild(listitem);
-        document.getElementById("identity_list").selectedItem = listitem;
+        document.getElementById("virtualIdentityExtension_IdentityListPopup").appendChild(listitem);
+        document.getElementById("virtualIdentityExtension_IdentityList").selectedItem = listitem;
         var separator = document.createElement("menuseparator");
-        document.getElementById("identity_list_popup").appendChild(separator);
+        document.getElementById("virtualIdentityExtension_IdentityListPopup").appendChild(separator);
 
-        FillIdentityList(document.getElementById("identity_list"))
+        FillIdentityList(document.getElementById("virtualIdentityExtension_IdentityList"))
     },
 
@@ -81 +81 @@
         // set Identity
         rdfDataEditor.__populateIdentityMenu();
-        var MenuItems = document.getElementById("identity_list_popup").childNodes;
+        var MenuItems = document.getElementById("virtualIdentityExtension_IdentityListPopup").childNodes;
         for (var index = 0; index < MenuItems.length; index++) {
             if (MenuItems[index].getAttribute("value") == rdfDataEditor.__identityData.id.key) {
-                document.getElementById("identity_list").selectedItem =
+                document.getElementById("virtualIdentityExtension_IdentityList").selectedItem =
                         MenuItems[index];
                 break;
@@ -91 +91 @@
 
         // set SMTP
-        document.getElementById("smtpServerListHbox").addNoneServer(); // add non (not stored) Server
-        document.getElementById("smtpServerListHbox").smtp = rdfDataEditor.__identityData.smtp.keyNice;
+        document.getElementById("virtualIdentityExtension_smtpServerListHbox").addNoneServer(); // add non (not stored) Server
+        document.getElementById("virtualIdentityExtension_smtpServerListHbox").smtp = rdfDataEditor.__identityData.smtp.keyNice;
         
         // set extra values
@@ -134 +134 @@
         Log.debug("accept\n");
         var localIdentityData = new vI.identityData(document.getElementById("sender").value, null,
-            document.getElementById("identity_list").selectedItem.getAttribute("value"),
-            document.getElementById("smtp_server_list").selectedItem.getAttribute("key"));
+            document.getElementById("virtualIdentityExtension_IdentityList").selectedItem.getAttribute("value"),
+            document.getElementById("virtualIdentityExtension_SmtpServerList").selectedItem.getAttribute("key"));
         Log.debug("before getValuesFromEnvironment\n");
         localIdentityData.extras.getValuesFromEnvironment();

content/vI_rdfDataEditor.xul

@@ -42 +42 @@
 
     <dialogheader title="&vI_rdfDataEditor.header.label;"/>
-    <vbox id="vI_rdfDataEditorContent">
+    <vbox id="virtualIdentityExtension_rdfDataEditorContent">
     <hbox>
         <vbox><spacer flex="1"/>
@@ -62 +62 @@
         <hbox>
             <vbox><spacer flex="1"/>
-                <label value="&vI_rdfDataEditor.smtp.label;" accesskey="&vI_rdfDataEditor.smtp.accesskey;" control="smtp_server_list"/>
+                <label value="&vI_rdfDataEditor.smtp.label;" accesskey="&vI_rdfDataEditor.smtp.accesskey;" control="virtualIdentityExtension_SmtpServerList"/>
             <spacer flex="1"/></vbox>
             <!-- structure to show SMTP server -->
-            <hbox id="smtpServerListHbox" class="smtpServerListHbox" />
+            <hbox id="virtualIdentityExtension_smtpServerListHbox" class="smtpServerListHbox" />
             
             <vbox><spacer flex="1"/>
-                <label value="&vI_rdfDataEditor.identity.label;" accesskey="&vI_rdfDataEditor.identity.accesskey;" control="identity_list"/>
+                <label value="&vI_rdfDataEditor.identity.label;" accesskey="&vI_rdfDataEditor.identity.accesskey;" control="virtualIdentityExtension_IdentityList"/>
             <spacer flex="1"/></vbox>
-            <menulist id="identity_list">
-                <menupopup id="identity_list_popup" />
+            <menulist id="virtualIdentityExtension_IdentityList">
+                <menupopup id="virtualIdentityExtension_IdentityListPopup" />
             </menulist>
         </hbox>

content/vI_rdfDataEditor_dataExtrasOverlay.xul

@@ -37 +37 @@
 
 <script type="application/x-javascript" src="chrome://global/content/charsetOverlay.js"/>
-    <vbox id="vI_rdfDataEditorContent">
+    <vbox id="virtualIdentityExtension_rdfDataEditorContent">
     <groupbox>
     <caption>

content/vI_statusmenu.js

@@ -130 +130 @@
         statusmenu.objStorageSaveMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_save");
         statusmenu.objStatusMenuSeparator = document.getElementById("virtualIdentityExtension_statusMenu_separator");
-        statusmenu.objSaveSwitch = document.getElementById("saveSwitch");
-        statusmenu.objSaveBaseIDSwitch = document.getElementById("saveBaseIDSwitch");
-        statusmenu.objSaveSMTPSwitch = document.getElementById("saveSMTPSwitch");
+        statusmenu.objSaveSwitch = document.getElementById("virtualIdentityExtension_saveSwitch");
+        statusmenu.objSaveBaseIDSwitch = document.getElementById("virtualIdentityExtension_saveBaseIDSwitch");
+        statusmenu.objSaveSMTPSwitch = document.getElementById("virtualIdentityExtension_SaveSmtpSwitch");
         statusmenu.objFccSwitch = document.getElementById("virtualIdentityExtension_fccSwitch");
         statusmenu.objStatusText = document.getElementById("statusText");

skin/v_identity.css

@@ -46 +46 @@
     -moz-binding: url("chrome://v_identity/content/bindings/v_identity.xml#smtpServerList");
 }
-#vI_rdfDataEditorContent checkbox.vI_plain {
+#virtualIdentityExtension_rdfDataEditorContent checkbox.vI_plain {
     display: none;
 }