Changeset 598551


Ignore:
Timestamp:
Nov 17, 2011, 8:51:33 AM (8 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
f0f59c
Parents:
750887
Message:

further bugfixes, all togehter, yeah

Files:
13 edited

Legend:

Unmodified
Added
Removed
  • content/bindings/vI_htmlTextBox.xml

    r750887 r598551  
    3535          xmlns:xbl="http://www.mozilla.org/xbl">
    3636   
    37     <binding id="vI_remoteBrowserBox">
     37    <binding id="virtualIdentityExtension_remoteBrowserBox">
    3838    <content>
    3939        <xul:vbox flex="1" >
    40             <xul:vbox class="vI_remoteBrowserBoxProgressmeter" flex="1" >
     40            <xul:vbox class="virtualIdentityExtension_remoteBrowserBoxProgressmeter" flex="1" >
    4141                <xul:progressmeter mode="undetermined" />
    4242                <xul:spacer flex="1" />
     
    137137    </field>
    138138    <field name="_progress">
    139         document.getAnonymousElementByAttribute(this, "class", "vI_remoteBrowserBoxProgressmeter");
     139        document.getAnonymousElementByAttribute(this, "class", "virtualIdentityExtension_remoteBrowserBoxProgressmeter");
    140140    </field>
    141141    <property name="localCss" onget="return this.getAttribute('localCss');" onset="this.setAttribute('localCss', val); return val;" />
  • content/prefDialog/vI_prefDialog.js

    r750887 r598551  
    3131var prefDialog = {
    3232    toggleHelp : function() {
    33         var browserElem = document.getElementById("vI_remoteBrowserBox");
     33        var browserElem = document.getElementById("virtualIdentityExtension_remoteBrowserBox");
    3434        if (browserElem.getAttribute("hidden")) {
    3535            window.resizeBy( 200, 0);
     
    4343
    4444    updateHelpUrl : function(tabpanel) {
    45         var browserElem = document.getElementById("vI_remoteBrowserBox");
     45        var browserElem = document.getElementById("virtualIdentityExtension_remoteBrowserBox");
    4646        if (browserElem.getAttribute("hidden")) return;             // don't load any url if browser is hidden
    4747        var panelIndex = (tabpanel)?tabpanel:document.getElementById('prefTabbox').selectedIndex
     
    5050        var extVersion = currentVersion[0] + "." + currentVersion[1];
    5151        var url = "https://www.absorb.it/virtual-id/wiki/docs/" + extVersion + "/tab" + panelIndex + "/tree" + prefTree.currentIndex;
    52         document.getElementById("vI_remoteBrowserBox").url = url;
     52        document.getElementById("virtualIdentityExtension_remoteBrowserBox").url = url;
    5353    },
    5454
  • content/prefDialog/vI_prefDialog.xul

    r750887 r598551  
    731731    </tabpanels>
    732732</tabbox>
    733 <browserbox id="vI_remoteBrowserBox" class="vI_remoteBrowserBox" localCss="localDoc.css" flex="1" hidden="true" type="content" />
     733<browserbox id="virtualIdentityExtension_remoteBrowserBox" class="virtualIdentityExtension_remoteBrowserBox" localCss="localDoc.css" flex="1" hidden="true" type="content" />
    734734<label id="virtualIdentityExtension_extVersion" value="&vident.version;" hidden="true" />
    735735</hbox>
    736 <textbox id="vIDebugBox" />
     736<textbox id="virtualIdentityExtension_debugBox" />
    737737</dialog>
    738738</overlay>
  • content/vI_context.xul

    r750887 r598551  
    3838    virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
    3939   
    40     Components.utils.import("resource://v_identity/vI_rdfDatasource.js");
     40    Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
    4141   
    4242    var vI_context = {
     
    7272                        <menuitem label="&vident.vI_Menu.DataEditor.label;"
    7373                            oncommand="window.open('chrome://v_identity/content/vI_rdfDataTree.xul', '', 'chrome, dialog, resizable=yes');" />
    74                         <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="dump('command: ' + virtualIdentityExtension.initTime + '\n');var vI_localRdfDatasource = new rdfDatasourceImporter('virtualIdentity.rdf');"/>
    75                         <menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="dump('command: ' + virtualIdentityExtension.initTime + '\n');var vI_localRdfDatasource = new rdfDatasource(); vI_localRdfDatasource.export('virtualIdentity.rdf')"/>
     74                        <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="dump('command: ' + virtualIdentityExtension.initTime + '\n');var vI_localRdfDatasource = new virtualIdentityExtension.rdfDatasourceImporter('virtualIdentity.rdf');"/>
     75                        <menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="dump('command: ' + virtualIdentityExtension.initTime + '\n');var vI_localRdfDatasource = new virtualIdentityExtension.rdfDatasource(); vI_localRdfDatasource.export('virtualIdentity.rdf')"/>
    7676                    </menupopup>
    7777                </menu>
  • content/vI_getHeader.xul

    r750887 r598551  
    4343
    4444<vbox id="messagepanebox" >
    45   <textbox id="virtualIdentityExtension_vIDebugBox" />
     45  <textbox id="virtualIdentityExtension_debugBox" />
    4646</vbox>
    4747
  • content/vI_rdfDataEditor.xul

    r750887 r598551  
    8282    </groupbox>
    8383    </vbox>
    84     <textbox id="virtualIdentityExtension_vIDebugBox" />
     84    <textbox id="virtualIdentityExtension_debugBox" />
    8585</dialog>
  • content/vI_rdfDataTree.xul

    r750887 r598551  
    303303<!-- <splitter /> -->
    304304<browser id="rdfDataTreeCollectionInfoBox" class="vI_htmlTextBox" type="chrome" cssSource="vI_rdfTreeInfo.css" disablehistory="true" onoverflow="virtualIdentityExtension.rdfDataTreeCollection.overflow();"/>
    305 <textbox id="virtualIdentityExtension_vIDebugBox" />
     305<textbox id="virtualIdentityExtension_debugBox" />
    306306</window>
  • content/vI_upgrade.xul

    r750887 r598551  
    8282        <groupbox>
    8383            <caption label="&vident.upgrade.upgrade.caption;"/>
    84             <textbox id="virtualIdentityExtension_vIDebugBox" />
     84            <textbox id="virtualIdentityExtension_debugBox" />
    8585        </groupbox>
    8686    </wizardpage>   
  • content/v_identity.xul

    r750887 r598551  
    4848
    4949<vbox id="appcontent" >
    50   <textbox id="virtualIdentityExtension_vIDebugBox" />
     50  <textbox id="virtualIdentityExtension_debugBox" />
    5151</vbox>
    5252
  • modules/plugins/conversations.js

    r750887 r598551  
    137137          recipients.push( { recipient: combinedNames.value[index], recipientType: "addr_to" } )
    138138
    139         returnValue = prepareSendMsg(virtualIdInUse, Ci.nsIMsgCompDeliverMode.Now,
     139        returnValue = vIaccount_prepareSendMsg(virtualIdInUse, Ci.nsIMsgCompDeliverMode.Now,
    140140          currentIdentityData, aAddress.params.identity, recipients );
    141141        Log.debug("returnValue.update:", returnValue.update);
     
    149149        }
    150150       
    151         aAddress.params.identity = vIaccount_defaultIdentity
    152         if (!finalCheck(currentIdentityData, aAddress.params.identity)) {
    153           vIaccount_removeUsedVIAccountt();
     151        aAddress.params.identity = get_vIaccount().defaultIdentity;
     152        if (!vIaccount_finalCheck(currentIdentityData, aAddress.params.identity)) {
     153          vIaccount_removeUsedVIAccount();
    154154          aStatus.canceled = true; return aStatus;
    155155        }
  • modules/vI_account.js

    r750887 r598551  
    2727  "vIaccount_createAccount", "vIaccount_removeUsedVIAccount" ]
    2828
     29Components.utils.import("resource://gre/modules/Services.jsm");
    2930Components.utils.import("resource://v_identity/vI_log.js");
    3031Components.utils.import("resource://v_identity/vI_identityData.js");
     
    330331       
    331332        account._account.defaultIdentity.smtpServerKey = identityData.smtp.keyNice; // key with "" for vI.DEFAULT_SMTP_TAG
    332         if (account._account.defaultIdentity.smtpServerKey == virtualIdentityExtension.NO_SMTP_TAG)
     333        if (account._account.defaultIdentity.smtpServerKey == NO_SMTP_TAG)
    333334            account._account.defaultIdentity.smtpServerKey = baseIdentity.smtpServerKey;
    334335
  • modules/vI_log.js

    r750887 r598551  
    9696      .getService(Ci.nsIWindowMediator)
    9797      .getMostRecentWindow(null);
    98     obj_debugBox = window.document.getElementById("virtualIdentityExtension_vIDebugBox");
     98    obj_debugBox = window.document.getElementById("virtualIdentityExtension_debugBox");
    9999    if (obj_debugBox)
    100100      obj_debugBox.dump(message);
     
    221221    .getService(Ci.nsIWindowMediator)
    222222    .getMostRecentWindow(null);
    223   let obj_debugBox = currentWindow.document.getElementById("virtualIdentityExtension_vIDebugBox");
     223  let obj_debugBox = currentWindow.document.getElementById("virtualIdentityExtension_debugBox");
    224224  if (obj_debugBox)
    225225    obj_debugBox.clear();
  • skin/v_identity.css

    r750887 r598551  
    328328}
    329329
    330 #virtualIdentityExtension_vIDebugBox {
     330#virtualIdentityExtension_debugBox {
    331331    -moz-binding: url("chrome://v_identity/content/bindings/vI_debugBox.xml#vI_debugBox");
    332332}
    333333
    334 #virtualIdentityExtension_vIDebugBox, #virtualIdentityExtension_vIErrorBox{
     334#virtualIdentityExtension_debugBox, #virtualIdentityExtension_vIErrorBox{
    335335    overflow: auto;
    336336    font-size: x-small;
     
    395395}
    396396
    397 .vI_remoteBrowserBox {
    398     -moz-binding: url("chrome://v_identity/content/bindings/vI_htmlTextBox.xml#vI_remoteBrowserBox");
     397.virtualIdentityExtension_remoteBrowserBox {
     398    -moz-binding: url("chrome://v_identity/content/bindings/vI_htmlTextBox.xml#virtualIdentityExtension_remoteBrowserBox");
    399399    margin: 0;
    400400    -moz-appearance: listbox;
Note: See TracChangeset for help on using the changeset viewer.