Changeset 018766


Ignore:
Timestamp:
Nov 26, 2011, 8:37:07 PM (8 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
45adef
Parents:
826c34
Message:

another set of global pollution preventing (never ending story)

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • content/bindings/v_identity.xml

    r826c34 r018766  
    135135        this.smtp = this._identityDataStorage.smtp.value;
    136136        virtualIdentityExtension.MyLog.debug("** v_identity.xml fromPopupItem_clone constructor smtp='" + this.smtp + "'.\n")
    137         this.smtpStyle = "width:" + document.getElementById("smtp_server_list").clientWidth + "px;";
     137        this.smtpStyle = "width:" + document.getElementById("virtualIdentityExtension_SmtpServerList").clientWidth + "px;";
    138138        this._identityDataStorage.smtp.value;
    139139       
     
    169169    <content sizetopopup="pref">
    170170        <xul:hbox id="smtpServerHbox" class="smtpServerHbox">
    171             <xul:menulist class="smtpServerMenuList" anonid="smtpServerMenuList" allowevents="true" id="smtp_server_list">
    172                 <xul:menupopup anonid="smtp_server_list_popup" />
     171            <xul:menulist class="smtpServerMenuList" anonid="smtpServerMenuList" allowevents="true" id="virtualIdentityExtension_SmtpServerList">
     172                <xul:menupopup anonid="virtualIdentityExtension_SmtpServerList_popup" />
    173173            </xul:menulist>
    174             <xul:checkbox  id="saveSMTPSwitch" class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.vIprefs.set('storage_store_SMTP', this.checked);" >
     174            <xul:checkbox  id="virtualIdentityExtension_SaveSmtpSwitch" class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.vIprefs.set('storage_store_SMTP', this.checked);" >
    175175                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="checked" />
    176176                <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveSMTP" attribute="disabled" />
     
    263263        ]]></setter>
    264264    </property>
    265     <field name="_smtpPopup">document.getAnonymousElementByAttribute(this, "anonid", "smtp_server_list_popup")</field>
     265    <field name="_smtpPopup">document.getAnonymousElementByAttribute(this, "anonid", "virtualIdentityExtension_SmtpServerList_popup")</field>
    266266    <field name="_smtpMenu">document.getAnonymousElementByAttribute(this, "anonid", "smtpServerMenuList")</field>
    267267    <field name="_smtpService"></field>
     
    291291                    crop="right" highlightnonmatches="true"/>
    292292                <xul:spacer flex="1" /></xul:vbox>
    293                 <xul:vbox id="saveSwitch"><xul:spacer flex="1" />
     293                <xul:vbox id="virtualIdentityExtension_saveSwitch"><xul:spacer flex="1" />
    294294                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.vIprefs.set('storage_store', this.checked);" >
    295295                        <xul:observes element="virtualIdentityExtension_statusMenu_storage_save" attribute="checked" />
     
    308308                    </xul:hbox>
    309309                <xul:spacer flex="1" /></xul:vbox>
    310                 <xul:vbox id="saveBaseIDSwitch"><xul:spacer flex="1" />
     310                <xul:vbox id="virtualIdentityExtension_saveBaseIDSwitch"><xul:spacer flex="1" />
    311311                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.vIprefs.set('storage_store_base_id', this.checked);" >
    312312                        <xul:observes element="virtualIdentityExtension_statusMenu_storage_saveBaseID" attribute="checked" />
     
    600600        for (var j = 0; j < MenuItems.length; j++) {
    601601            if (MenuItems[j].localName == "menuseparator") continue;
    602             MenuItems[j].smtpStyle = "width:" + document.getElementById("smtp_server_list").clientWidth + "px;";
     602            MenuItems[j].smtpStyle = "width:" + document.getElementById("virtualIdentityExtension_SmtpServerList").clientWidth + "px;";
    603603        }
    604604    ]]></method>
  • content/vI_rdfDataEditor.js

    r826c34 r018766  
    4040        var listitem = document.createElement("menuitem");
    4141        listitem.setAttribute("label", "");
    42         document.getElementById("identity_list_popup").appendChild(listitem);
    43         document.getElementById("identity_list").selectedItem = listitem;
     42        document.getElementById("virtualIdentityExtension_IdentityListPopup").appendChild(listitem);
     43        document.getElementById("virtualIdentityExtension_IdentityList").selectedItem = listitem;
    4444        var separator = document.createElement("menuseparator");
    45         document.getElementById("identity_list_popup").appendChild(separator);
     45        document.getElementById("virtualIdentityExtension_IdentityListPopup").appendChild(separator);
    4646
    47         FillIdentityList(document.getElementById("identity_list"))
     47        FillIdentityList(document.getElementById("virtualIdentityExtension_IdentityList"))
    4848    },
    4949
     
    8181        // set Identity
    8282        rdfDataEditor.__populateIdentityMenu();
    83         var MenuItems = document.getElementById("identity_list_popup").childNodes;
     83        var MenuItems = document.getElementById("virtualIdentityExtension_IdentityListPopup").childNodes;
    8484        for (var index = 0; index < MenuItems.length; index++) {
    8585            if (MenuItems[index].getAttribute("value") == rdfDataEditor.__identityData.id.key) {
    86                 document.getElementById("identity_list").selectedItem =
     86                document.getElementById("virtualIdentityExtension_IdentityList").selectedItem =
    8787                        MenuItems[index];
    8888                break;
     
    9191
    9292        // set SMTP
    93         document.getElementById("smtpServerListHbox").addNoneServer(); // add non (not stored) Server
    94         document.getElementById("smtpServerListHbox").smtp = rdfDataEditor.__identityData.smtp.keyNice;
     93        document.getElementById("virtualIdentityExtension_smtpServerListHbox").addNoneServer(); // add non (not stored) Server
     94        document.getElementById("virtualIdentityExtension_smtpServerListHbox").smtp = rdfDataEditor.__identityData.smtp.keyNice;
    9595       
    9696        // set extra values
     
    134134        Log.debug("accept\n");
    135135        var localIdentityData = new vI.identityData(document.getElementById("sender").value, null,
    136             document.getElementById("identity_list").selectedItem.getAttribute("value"),
    137             document.getElementById("smtp_server_list").selectedItem.getAttribute("key"));
     136            document.getElementById("virtualIdentityExtension_IdentityList").selectedItem.getAttribute("value"),
     137            document.getElementById("virtualIdentityExtension_SmtpServerList").selectedItem.getAttribute("key"));
    138138        Log.debug("before getValuesFromEnvironment\n");
    139139        localIdentityData.extras.getValuesFromEnvironment();
  • content/vI_rdfDataEditor.xul

    r826c34 r018766  
    4242
    4343    <dialogheader title="&vI_rdfDataEditor.header.label;"/>
    44     <vbox id="vI_rdfDataEditorContent">
     44    <vbox id="virtualIdentityExtension_rdfDataEditorContent">
    4545    <hbox>
    4646        <vbox><spacer flex="1"/>
     
    6262        <hbox>
    6363            <vbox><spacer flex="1"/>
    64                 <label value="&vI_rdfDataEditor.smtp.label;" accesskey="&vI_rdfDataEditor.smtp.accesskey;" control="smtp_server_list"/>
     64                <label value="&vI_rdfDataEditor.smtp.label;" accesskey="&vI_rdfDataEditor.smtp.accesskey;" control="virtualIdentityExtension_SmtpServerList"/>
    6565            <spacer flex="1"/></vbox>
    6666            <!-- structure to show SMTP server -->
    67             <hbox id="smtpServerListHbox" class="smtpServerListHbox" />
     67            <hbox id="virtualIdentityExtension_smtpServerListHbox" class="smtpServerListHbox" />
    6868           
    6969            <vbox><spacer flex="1"/>
    70                 <label value="&vI_rdfDataEditor.identity.label;" accesskey="&vI_rdfDataEditor.identity.accesskey;" control="identity_list"/>
     70                <label value="&vI_rdfDataEditor.identity.label;" accesskey="&vI_rdfDataEditor.identity.accesskey;" control="virtualIdentityExtension_IdentityList"/>
    7171            <spacer flex="1"/></vbox>
    72             <menulist id="identity_list">
    73                 <menupopup id="identity_list_popup" />
     72            <menulist id="virtualIdentityExtension_IdentityList">
     73                <menupopup id="virtualIdentityExtension_IdentityListPopup" />
    7474            </menulist>
    7575        </hbox>
  • content/vI_rdfDataEditor_dataExtrasOverlay.xul

    r826c34 r018766  
    3737
    3838<script type="application/x-javascript" src="chrome://global/content/charsetOverlay.js"/>
    39     <vbox id="vI_rdfDataEditorContent">
     39    <vbox id="virtualIdentityExtension_rdfDataEditorContent">
    4040    <groupbox>
    4141    <caption>
  • content/vI_statusmenu.js

    r826c34 r018766  
    130130        statusmenu.objStorageSaveMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_save");
    131131        statusmenu.objStatusMenuSeparator = document.getElementById("virtualIdentityExtension_statusMenu_separator");
    132         statusmenu.objSaveSwitch = document.getElementById("saveSwitch");
    133         statusmenu.objSaveBaseIDSwitch = document.getElementById("saveBaseIDSwitch");
    134         statusmenu.objSaveSMTPSwitch = document.getElementById("saveSMTPSwitch");
     132        statusmenu.objSaveSwitch = document.getElementById("virtualIdentityExtension_saveSwitch");
     133        statusmenu.objSaveBaseIDSwitch = document.getElementById("virtualIdentityExtension_saveBaseIDSwitch");
     134        statusmenu.objSaveSMTPSwitch = document.getElementById("virtualIdentityExtension_SaveSmtpSwitch");
    135135        statusmenu.objFccSwitch = document.getElementById("virtualIdentityExtension_fccSwitch");
    136136        statusmenu.objStatusText = document.getElementById("statusText");
  • skin/v_identity.css

    r826c34 r018766  
    4646    -moz-binding: url("chrome://v_identity/content/bindings/v_identity.xml#smtpServerList");
    4747}
    48 #vI_rdfDataEditorContent checkbox.vI_plain {
     48#virtualIdentityExtension_rdfDataEditorContent checkbox.vI_plain {
    4949    display: none;
    5050}
Note: See TracChangeset for help on using the changeset viewer.