Changeset 2a4365

Timestamp:

Aug 17, 2011, 12:44:06 PM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.8, ng_0.9

Children:

570ecf

Parents:

190674

Message:

prevent id pollution

Location:

chrome/content/v_identity

Files:

• vI_statusmenu.js (modified) (2 diffs)
• v_identity.xml (modified) (4 diffs)
• v_identity.xul (modified) (3 diffs)

chrome/content/v_identity/vI_statusmenu.js

@@ -118 +118 @@
 
         statusmenu.objStatusMenu = document.getElementById("vI-status-menu");
-        statusmenu.objSaveBaseIDMenuItem = document.getElementById("vI_statusMenu_storage_saveBaseID");
-        statusmenu.objSaveSMTPMenuItem = document.getElementById("vI_statusMenu_storage_saveSMTP");
-        statusmenu.objStorageSaveMenuItem = document.getElementById("vI_statusMenu_storage_save");
-        statusmenu.objStatusMenuSeparator = document.getElementById("vI_statusMenu_separator");
+        statusmenu.objSaveBaseIDMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_saveBaseID");
+        statusmenu.objSaveSMTPMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_saveSMTP");
+        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");
@@ -127 +127 @@
         statusmenu.objFccSwitch = document.getElementById("fcc_switch");
         statusmenu.objStatusText = document.getElementById("statusText");
-        statusmenu.objStatusTooltipLine1 = document.getElementById("vI_statusMenuTooltip_StatusValueLine1");
-        statusmenu.objStatusTooltipLine2 = document.getElementById("vI_statusMenuTooltip_StatusValueLine2");
+        statusmenu.objStatusTooltipLine1 = document.getElementById("virtualIdentityExtension_statusMenuTooltip_StatusValueLine1");
+        statusmenu.objStatusTooltipLine2 = document.getElementById("virtualIdentityExtension_statusMenuTooltip_StatusValueLine2");
 
         statusmenu.addObserver();

chrome/content/v_identity/v_identity.xml

@@ -170 +170 @@
             </xul:menulist>
             <xul:checkbox  id="saveSMTPSwitch" class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.statusmenu.changeSMTPStatus(this);" >
-                <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="checked" />
-                <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="disabled" />
+                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="checked" />
+                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="disabled" />
             </xul:checkbox>
-            <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="checked" />
-            <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="disabled" />
+            <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="checked" />
+            <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="disabled" />
         </xul:hbox>
     </content>
@@ -286 +286 @@
                 <xul:vbox id="saveSwitch"><xul:spacer flex="1" />
                     <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.statusmenu.changeSaveStatus(this);" >
-                        <xul:observes element="vI_statusMenu_storage_save" attribute="checked" />
+                        <xul:observes element="virtualIdentityExtension_statusMenu_storage_save" attribute="checked" />
                     </xul:checkbox>
                 <xul:spacer flex="1" /></xul:vbox>
@@ -292 +292 @@
                     <xul:label value="&vident.accPane.prettyName.prefix;" class="menu_clone-vid virtIdLabel" xbl:inherits="vid" crop="right"/>
                 <xul:spacer flex="1" /></xul:vbox>
-                <xul:observes element="vI_statusMenu_storage_save" attribute="checked" />
+                <xul:observes element="virtualIdentityExtension_statusMenu_storage_save" attribute="checked" />
             </xul:hbox>
             <xul:hbox id="baseIDHbox" class="baseIDHbox" >
@@ -303 +303 @@
                 <xul:vbox id="saveBaseIDSwitch"><xul:spacer flex="1" />
                     <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.statusmenu.changeBaseIDStatus(this);" >
-                        <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="checked" />
-                        <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="disabled" />
+                        <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="checked" />
+                        <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="disabled" />
                     </xul:checkbox>
                 <xul:spacer flex="1" /></xul:vbox>
-                <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="checked" />
-                <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="disabled" />
+                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="checked" />
+                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="disabled" />
             </xul:hbox>
             <xul:hbox oncommand="event.stopPropagation();document.getBindingParent(this).smtp = this.smtp" xbl:inherits="showSmtp" anonid="smtpServerListHbox" class="smtpServerListHbox" />

chrome/content/v_identity/v_identity.xul

@@ -82 +82 @@
   
   <popupset>
-      <menupopup id="vI_statusMenu">
-          <menuitem type="checkbox" id="vI_statusMenu_storage_save" label="&vident.vI_Menu.storageSave.label;"
+      <menupopup id="virtualIdentityExtension_statusMenu">
+          <menuitem type="checkbox" id="virtualIdentityExtension_statusMenu_storage_save" label="&vident.vI_Menu.storageSave.label;"
             oncommand="virtualIdentityExtension.statusmenu.menuConstraint(this);"/>
-          <menuitem type="checkbox" id="vI_statusMenu_storage_saveBaseID" label="&vident.vI_Menu.saveBaseID.label;"
+          <menuitem type="checkbox" id="virtualIdentityExtension_statusMenu_storage_saveBaseID" label="&vident.vI_Menu.saveBaseID.label;"
             oncommand="virtualIdentityExtension.statusmenu.menuConstraint(virtualIdentityExtension.statusmenu.objStorageSaveMenuItem);"/>
-          <menuitem type="checkbox" id="vI_statusMenu_storage_saveSMTP" label="&vident.vI_Menu.saveSMTP.label;"
+          <menuitem type="checkbox" id="virtualIdentityExtension_statusMenu_storage_saveSMTP" label="&vident.vI_Menu.saveSMTP.label;"
             oncommand="virtualIdentityExtension.statusmenu.menuConstraint(virtualIdentityExtension.statusmenu.objStorageSaveMenuItem);"/>
-          <menuseparator id="vI_statusMenu_separator" />
+          <menuseparator id="virtualIdentityExtension_statusMenu_separator" />
           <menuitem class="menuitem-iconic" label="&vident.vI_Menu.Settings.label;"
             oncommand="window.open('chrome://v_identity/content/vI_prefDialog_TB3.xul', '', 'chrome, dialog, alwaysRaised, resizable=yes');" />
@@ -103 +103 @@
   </popupset>
   <popupset>
-      <tooltip id="vI_statusMenuTooltip" orient="vertical" >
-        <label id="vI_statusMenuTooltip_Title" value="&vident.vI_Menu.TooltipTitle.label;" />
-        <label id="vI_statusMenuTooltip_StatusValueLine1" />
-        <label id="vI_statusMenuTooltip_StatusValueLine2" />
-        <label id="vI_statusMenuTooltip_Change" value="&vident.vI_Menu.TooltipChange.label;" />
+      <tooltip id="virtualIdentityExtension_statusMenuTooltip" orient="vertical" >
+        <label id="virtualIdentityExtension_statusMenuTooltip_Title" value="&vident.vI_Menu.TooltipTitle.label;" />
+        <label id="virtualIdentityExtension_statusMenuTooltip_StatusValueLine1" />
+        <label id="virtualIdentityExtension_statusMenuTooltip_StatusValueLine2" />
+        <label id="virtualIdentityExtension_statusMenuTooltip_Change" value="&vident.vI_Menu.TooltipChange.label;" />
       </tooltip>
   </popupset>
@@ -123 +123 @@
               collapsed="true"
               insertafter="totalMessageCount"
-              context="vI_statusMenu"
-              tooltip="vI_statusMenuTooltip"
+              context="virtualIdentityExtension_statusMenu"
+              tooltip="virtualIdentityExtension_statusMenuTooltip"
               onclick="virtualIdentityExtension.statusmenu.clicked(event.button);" />
 </statusbar>