Changeset 598551
- Timestamp:
- Nov 17, 2011, 8:51:33 AM (9 years ago)
- Branches:
- ng_0.9
- Children:
- f0f59c
- Parents:
- 750887
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
content/bindings/vI_htmlTextBox.xml
r750887 r598551 35 35 xmlns:xbl="http://www.mozilla.org/xbl"> 36 36 37 <binding id="v I_remoteBrowserBox">37 <binding id="virtualIdentityExtension_remoteBrowserBox"> 38 38 <content> 39 39 <xul:vbox flex="1" > 40 <xul:vbox class="v I_remoteBrowserBoxProgressmeter" flex="1" >40 <xul:vbox class="virtualIdentityExtension_remoteBrowserBoxProgressmeter" flex="1" > 41 41 <xul:progressmeter mode="undetermined" /> 42 42 <xul:spacer flex="1" /> … … 137 137 </field> 138 138 <field name="_progress"> 139 document.getAnonymousElementByAttribute(this, "class", "v I_remoteBrowserBoxProgressmeter");139 document.getAnonymousElementByAttribute(this, "class", "virtualIdentityExtension_remoteBrowserBoxProgressmeter"); 140 140 </field> 141 141 <property name="localCss" onget="return this.getAttribute('localCss');" onset="this.setAttribute('localCss', val); return val;" /> -
content/prefDialog/vI_prefDialog.js
r750887 r598551 31 31 var prefDialog = { 32 32 toggleHelp : function() { 33 var browserElem = document.getElementById("v I_remoteBrowserBox");33 var browserElem = document.getElementById("virtualIdentityExtension_remoteBrowserBox"); 34 34 if (browserElem.getAttribute("hidden")) { 35 35 window.resizeBy( 200, 0); … … 43 43 44 44 updateHelpUrl : function(tabpanel) { 45 var browserElem = document.getElementById("v I_remoteBrowserBox");45 var browserElem = document.getElementById("virtualIdentityExtension_remoteBrowserBox"); 46 46 if (browserElem.getAttribute("hidden")) return; // don't load any url if browser is hidden 47 47 var panelIndex = (tabpanel)?tabpanel:document.getElementById('prefTabbox').selectedIndex … … 50 50 var extVersion = currentVersion[0] + "." + currentVersion[1]; 51 51 var url = "https://www.absorb.it/virtual-id/wiki/docs/" + extVersion + "/tab" + panelIndex + "/tree" + prefTree.currentIndex; 52 document.getElementById("v I_remoteBrowserBox").url = url;52 document.getElementById("virtualIdentityExtension_remoteBrowserBox").url = url; 53 53 }, 54 54 -
content/prefDialog/vI_prefDialog.xul
r750887 r598551 731 731 </tabpanels> 732 732 </tabbox> 733 <browserbox id="v I_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" /> 734 734 <label id="virtualIdentityExtension_extVersion" value="&vident.version;" hidden="true" /> 735 735 </hbox> 736 <textbox id="v IDebugBox" />736 <textbox id="virtualIdentityExtension_debugBox" /> 737 737 </dialog> 738 738 </overlay> -
content/vI_context.xul
r750887 r598551 38 38 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) { 39 39 40 Components.utils.import("resource://v_identity/vI_rdfDatasource.js" );40 Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension); 41 41 42 42 var vI_context = { … … 72 72 <menuitem label="&vident.vI_Menu.DataEditor.label;" 73 73 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')"/> 76 76 </menupopup> 77 77 </menu> -
content/vI_getHeader.xul
r750887 r598551 43 43 44 44 <vbox id="messagepanebox" > 45 <textbox id="virtualIdentityExtension_ vIDebugBox" />45 <textbox id="virtualIdentityExtension_debugBox" /> 46 46 </vbox> 47 47 -
content/vI_rdfDataEditor.xul
r750887 r598551 82 82 </groupbox> 83 83 </vbox> 84 <textbox id="virtualIdentityExtension_ vIDebugBox" />84 <textbox id="virtualIdentityExtension_debugBox" /> 85 85 </dialog> -
content/vI_rdfDataTree.xul
r750887 r598551 303 303 <!-- <splitter /> --> 304 304 <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" /> 306 306 </window> -
content/vI_upgrade.xul
r750887 r598551 82 82 <groupbox> 83 83 <caption label="&vident.upgrade.upgrade.caption;"/> 84 <textbox id="virtualIdentityExtension_ vIDebugBox" />84 <textbox id="virtualIdentityExtension_debugBox" /> 85 85 </groupbox> 86 86 </wizardpage> -
content/v_identity.xul
r750887 r598551 48 48 49 49 <vbox id="appcontent" > 50 <textbox id="virtualIdentityExtension_ vIDebugBox" />50 <textbox id="virtualIdentityExtension_debugBox" /> 51 51 </vbox> 52 52 -
modules/plugins/conversations.js
r750887 r598551 137 137 recipients.push( { recipient: combinedNames.value[index], recipientType: "addr_to" } ) 138 138 139 returnValue = prepareSendMsg(virtualIdInUse, Ci.nsIMsgCompDeliverMode.Now,139 returnValue = vIaccount_prepareSendMsg(virtualIdInUse, Ci.nsIMsgCompDeliverMode.Now, 140 140 currentIdentityData, aAddress.params.identity, recipients ); 141 141 Log.debug("returnValue.update:", returnValue.update); … … 149 149 } 150 150 151 aAddress.params.identity = vIaccount_defaultIdentity152 if (! finalCheck(currentIdentityData, aAddress.params.identity)) {153 vIaccount_removeUsedVIAccount t();151 aAddress.params.identity = get_vIaccount().defaultIdentity; 152 if (!vIaccount_finalCheck(currentIdentityData, aAddress.params.identity)) { 153 vIaccount_removeUsedVIAccount(); 154 154 aStatus.canceled = true; return aStatus; 155 155 } -
modules/vI_account.js
r750887 r598551 27 27 "vIaccount_createAccount", "vIaccount_removeUsedVIAccount" ] 28 28 29 Components.utils.import("resource://gre/modules/Services.jsm"); 29 30 Components.utils.import("resource://v_identity/vI_log.js"); 30 31 Components.utils.import("resource://v_identity/vI_identityData.js"); … … 330 331 331 332 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) 333 334 account._account.defaultIdentity.smtpServerKey = baseIdentity.smtpServerKey; 334 335 -
modules/vI_log.js
r750887 r598551 96 96 .getService(Ci.nsIWindowMediator) 97 97 .getMostRecentWindow(null); 98 obj_debugBox = window.document.getElementById("virtualIdentityExtension_ vIDebugBox");98 obj_debugBox = window.document.getElementById("virtualIdentityExtension_debugBox"); 99 99 if (obj_debugBox) 100 100 obj_debugBox.dump(message); … … 221 221 .getService(Ci.nsIWindowMediator) 222 222 .getMostRecentWindow(null); 223 let obj_debugBox = currentWindow.document.getElementById("virtualIdentityExtension_ vIDebugBox");223 let obj_debugBox = currentWindow.document.getElementById("virtualIdentityExtension_debugBox"); 224 224 if (obj_debugBox) 225 225 obj_debugBox.clear(); -
skin/v_identity.css
r750887 r598551 328 328 } 329 329 330 #virtualIdentityExtension_ vIDebugBox {330 #virtualIdentityExtension_debugBox { 331 331 -moz-binding: url("chrome://v_identity/content/bindings/vI_debugBox.xml#vI_debugBox"); 332 332 } 333 333 334 #virtualIdentityExtension_ vIDebugBox, #virtualIdentityExtension_vIErrorBox{334 #virtualIdentityExtension_debugBox, #virtualIdentityExtension_vIErrorBox{ 335 335 overflow: auto; 336 336 font-size: x-small; … … 395 395 } 396 396 397 .v I_remoteBrowserBox {398 -moz-binding: url("chrome://v_identity/content/bindings/vI_htmlTextBox.xml#v I_remoteBrowserBox");397 .virtualIdentityExtension_remoteBrowserBox { 398 -moz-binding: url("chrome://v_identity/content/bindings/vI_htmlTextBox.xml#virtualIdentityExtension_remoteBrowserBox"); 399 399 margin: 0; 400 400 -moz-appearance: listbox;
Note: See TracChangeset
for help on using the changeset viewer.