Changeset 2a4365


Ignore:
Timestamp:
Aug 17, 2011, 12:44:06 PM (9 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:
3 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/vI_statusmenu.js

    r190674 r2a4365  
    118118
    119119        statusmenu.objStatusMenu = document.getElementById("vI-status-menu");
    120         statusmenu.objSaveBaseIDMenuItem = document.getElementById("vI_statusMenu_storage_saveBaseID");
    121         statusmenu.objSaveSMTPMenuItem = document.getElementById("vI_statusMenu_storage_saveSMTP");
    122         statusmenu.objStorageSaveMenuItem = document.getElementById("vI_statusMenu_storage_save");
    123         statusmenu.objStatusMenuSeparator = document.getElementById("vI_statusMenu_separator");
     120        statusmenu.objSaveBaseIDMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_saveBaseID");
     121        statusmenu.objSaveSMTPMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_saveSMTP");
     122        statusmenu.objStorageSaveMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_save");
     123        statusmenu.objStatusMenuSeparator = document.getElementById("virtualIdentityExtension_statusMenu_separator");
    124124        statusmenu.objSaveSwitch = document.getElementById("saveSwitch");
    125125        statusmenu.objSaveBaseIDSwitch = document.getElementById("saveBaseIDSwitch");
     
    127127        statusmenu.objFccSwitch = document.getElementById("fcc_switch");
    128128        statusmenu.objStatusText = document.getElementById("statusText");
    129         statusmenu.objStatusTooltipLine1 = document.getElementById("vI_statusMenuTooltip_StatusValueLine1");
    130         statusmenu.objStatusTooltipLine2 = document.getElementById("vI_statusMenuTooltip_StatusValueLine2");
     129        statusmenu.objStatusTooltipLine1 = document.getElementById("virtualIdentityExtension_statusMenuTooltip_StatusValueLine1");
     130        statusmenu.objStatusTooltipLine2 = document.getElementById("virtualIdentityExtension_statusMenuTooltip_StatusValueLine2");
    131131
    132132        statusmenu.addObserver();
  • chrome/content/v_identity/v_identity.xml

    r190674 r2a4365  
    170170            </xul:menulist>
    171171            <xul:checkbox  id="saveSMTPSwitch" class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.statusmenu.changeSMTPStatus(this);" >
    172                 <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="checked" />
    173                 <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="disabled" />
     172                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="checked" />
     173                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="disabled" />
    174174            </xul:checkbox>
    175             <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="checked" />
    176             <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="disabled" />
     175            <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="checked" />
     176            <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="disabled" />
    177177        </xul:hbox>
    178178    </content>
     
    286286                <xul:vbox id="saveSwitch"><xul:spacer flex="1" />
    287287                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.statusmenu.changeSaveStatus(this);" >
    288                         <xul:observes element="vI_statusMenu_storage_save" attribute="checked" />
     288                        <xul:observes element="virtualIdentityExtension_statusMenu_storage_save" attribute="checked" />
    289289                    </xul:checkbox>
    290290                <xul:spacer flex="1" /></xul:vbox>
     
    292292                    <xul:label value="&vident.accPane.prettyName.prefix;" class="menu_clone-vid virtIdLabel" xbl:inherits="vid" crop="right"/>
    293293                <xul:spacer flex="1" /></xul:vbox>
    294                 <xul:observes element="vI_statusMenu_storage_save" attribute="checked" />
     294                <xul:observes element="virtualIdentityExtension_statusMenu_storage_save" attribute="checked" />
    295295            </xul:hbox>
    296296            <xul:hbox id="baseIDHbox" class="baseIDHbox" >
     
    303303                <xul:vbox id="saveBaseIDSwitch"><xul:spacer flex="1" />
    304304                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.statusmenu.changeBaseIDStatus(this);" >
    305                         <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="checked" />
    306                         <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="disabled" />
     305                        <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="checked" />
     306                        <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="disabled" />
    307307                    </xul:checkbox>
    308308                <xul:spacer flex="1" /></xul:vbox>
    309                 <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="checked" />
    310                 <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="disabled" />
     309                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="checked" />
     310                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="disabled" />
    311311            </xul:hbox>
    312312            <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

    r190674 r2a4365  
    8282 
    8383  <popupset>
    84       <menupopup id="vI_statusMenu">
    85           <menuitem type="checkbox" id="vI_statusMenu_storage_save" label="&vident.vI_Menu.storageSave.label;"
     84      <menupopup id="virtualIdentityExtension_statusMenu">
     85          <menuitem type="checkbox" id="virtualIdentityExtension_statusMenu_storage_save" label="&vident.vI_Menu.storageSave.label;"
    8686            oncommand="virtualIdentityExtension.statusmenu.menuConstraint(this);"/>
    87           <menuitem type="checkbox" id="vI_statusMenu_storage_saveBaseID" label="&vident.vI_Menu.saveBaseID.label;"
     87          <menuitem type="checkbox" id="virtualIdentityExtension_statusMenu_storage_saveBaseID" label="&vident.vI_Menu.saveBaseID.label;"
    8888            oncommand="virtualIdentityExtension.statusmenu.menuConstraint(virtualIdentityExtension.statusmenu.objStorageSaveMenuItem);"/>
    89           <menuitem type="checkbox" id="vI_statusMenu_storage_saveSMTP" label="&vident.vI_Menu.saveSMTP.label;"
     89          <menuitem type="checkbox" id="virtualIdentityExtension_statusMenu_storage_saveSMTP" label="&vident.vI_Menu.saveSMTP.label;"
    9090            oncommand="virtualIdentityExtension.statusmenu.menuConstraint(virtualIdentityExtension.statusmenu.objStorageSaveMenuItem);"/>
    91           <menuseparator id="vI_statusMenu_separator" />
     91          <menuseparator id="virtualIdentityExtension_statusMenu_separator" />
    9292          <menuitem class="menuitem-iconic" label="&vident.vI_Menu.Settings.label;"
    9393            oncommand="window.open('chrome://v_identity/content/vI_prefDialog_TB3.xul', '', 'chrome, dialog, alwaysRaised, resizable=yes');" />
     
    103103  </popupset>
    104104  <popupset>
    105       <tooltip id="vI_statusMenuTooltip" orient="vertical" >
    106         <label id="vI_statusMenuTooltip_Title" value="&vident.vI_Menu.TooltipTitle.label;" />
    107         <label id="vI_statusMenuTooltip_StatusValueLine1" />
    108         <label id="vI_statusMenuTooltip_StatusValueLine2" />
    109         <label id="vI_statusMenuTooltip_Change" value="&vident.vI_Menu.TooltipChange.label;" />
     105      <tooltip id="virtualIdentityExtension_statusMenuTooltip" orient="vertical" >
     106        <label id="virtualIdentityExtension_statusMenuTooltip_Title" value="&vident.vI_Menu.TooltipTitle.label;" />
     107        <label id="virtualIdentityExtension_statusMenuTooltip_StatusValueLine1" />
     108        <label id="virtualIdentityExtension_statusMenuTooltip_StatusValueLine2" />
     109        <label id="virtualIdentityExtension_statusMenuTooltip_Change" value="&vident.vI_Menu.TooltipChange.label;" />
    110110      </tooltip>
    111111  </popupset>
     
    123123              collapsed="true"
    124124              insertafter="totalMessageCount"
    125               context="vI_statusMenu"
    126               tooltip="vI_statusMenuTooltip"
     125              context="virtualIdentityExtension_statusMenu"
     126              tooltip="virtualIdentityExtension_statusMenuTooltip"
    127127              onclick="virtualIdentityExtension.statusmenu.clicked(event.button);" />
    128128</statusbar>
Note: See TracChangeset for help on using the changeset viewer.