Changeset d56c39
- Timestamp:
- Nov 18, 2011, 2:35:54 AM (9 years ago)
- Branches:
- ng_0.9
- Children:
- 56301d
- Parents:
- b08078
- Files:
-
- 1 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
content/vI_context.xul
rb08078 rd56c39 39 39 40 40 Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension); 41 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 41 42 42 var vI_context = { 43 prefroot : Components.classes["@mozilla.org/preferences-service;1"] 44 .getService(Components.interfaces.nsIPrefService) 45 .getBranch(null), 46 47 observe: function(subject, topic, data) { 48 document.getElementById("virtualIdentityExtension_vIMenu").setAttribute("hidden", 49 !vI_context.prefroot.getBoolPref("extensions.virtualIdentity.menu_entry")); 50 } 51 43 var vI_context = { 44 observe: function(subject, topic, data) { 45 document.getElementById("virtualIdentityExtension_vIMenu").setAttribute("hidden", 46 !virtualIdentityExtension.vIprefs.get("menu_entry")); 47 } 52 48 } 53 49 window.addEventListener("load", function(e) { 54 vI_context.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2); 55 vI_context.prefroot.addObserver("extensions.virtualIdentity.menu_entry", vI_context, false); 56 vI_context.observe(); 50 virtualIdentityExtension.vIprefs.addObserver("menu_entry", vI_context.observe); 51 vI_context.observe(); 57 52 }, false); 58 53 window.addEventListener("unload", function(e) { 59 vI_context.prefroot.removeObserver("extensions.virtualIdentity.menu_entry", vI_context, false);54 virtualIdentityExtension.vIprefs.removeObserver("menu_entry", vI_context.observe); 60 55 }, false); 61 56 }}); 62 dump('context: ' + virtualIdentityExtension.initTime + '\n');63 57 </script> 64 58 -
content/vI_getHeader.js
rb08078 rd56c39 27 27 28 28 Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js"); 29 Components.utils.import("resource://v_identity/stdlib/msgHdrUtils.js", virtualIdentityExtension);30 29 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) { 31 30 31 Components.utils.import("resource://v_identity/stdlib/msgHdrUtils.js", virtualIdentityExtension); 32 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 32 33 let Log = vI.setupLogging("virtualIdentity.getHeader"); 33 34 34 35 // var storedHeaders = { }; 35 36 var getHeader = { 36 preferences : Components.classes["@mozilla.org/preferences-service;1"]37 .getService(Components.interfaces.nsIPrefService)38 .getBranch("extensions.virtualIdentity."),39 40 37 unicodeConverter : Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] 41 38 .createInstance(Components.interfaces.nsIScriptableUnicodeConverter), … … 46 43 47 44 prefObserverToSearchArray : function() { 48 var headerList = getHeader.unicodeConverter.ConvertToUnicode( getHeader.preferences.getCharPref("smart_reply_headers")).split(/\n/)45 var headerList = getHeader.unicodeConverter.ConvertToUnicode(vI.vIprefs.get("smart_reply_headers")).split(/\n/) 49 46 50 47 getHeader.headerToSearch = []; … … 142 139 143 140 var prefObserver = { 144 prefroot : Components.classes["@mozilla.org/preferences-service;1"]145 .getService(Components.interfaces.nsIPrefService)146 .getBranch(null).QueryInterface(Components.interfaces.nsIPrefBranch2),147 148 141 unicodeConverter : Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] 149 142 .createInstance(Components.interfaces.nsIScriptableUnicodeConverter), … … 152 145 153 146 init : function() { 154 prefObserver.prefroot.addObserver("extensions.virtualIdentity.smart_reply_headers", this, false); 147 let self = this; 148 vI.vIprefs.addObserver("smart_reply_headers", self.observe); 155 149 }, 156 150 157 151 cleanup : function() { 158 prefObserver.prefroot.removeObserver("extensions.virtualIdentity.smart_reply_headers", this); 152 let self = this; 153 vI.vIprefs.removeObserver("smart_reply_headers", self.observe); 159 154 }, 160 155 -
content/vI_msgIdentityCloneTools.js
rb08078 rd56c39 26 26 27 27 let Log = vI.setupLogging("virtualIdentity.msgIdentityCloneTools"); 28 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 28 29 29 30 var msgIdentityCloneTools = { 30 _pref : Components.classes["@mozilla.org/preferences-service;1"]31 .getService(Components.interfaces.nsIPrefService)32 .getBranch("extensions.virtualIdentity."),33 34 31 copySelectedIdentity : function(id_key) { 35 32 Log.debug("copySelectedIdentity\n"); … … 54 51 Log.debug("signatureSwitch hide/remove signatures\n"); 55 52 // code to hide the text signature 56 try { if ( msgIdentityCloneTools._pref.getBoolPref("hide_signature") && ss_signature.length == 0) {53 try { if (vI.vIpref.get("hide_signature") && ss_signature.length == 0) { 57 54 Log.debug("hide text/html signature"); 58 55 ss_main.signatureSwitch() … … 60 57 } } catch(vErr) { Log.debug(" -- missing signatureSwitch extension?\n"); }; 61 58 // code to hide the sMime signature 62 try { if ( msgIdentityCloneTools._pref.getBoolPref("hide_sMime_messageSignature")) {59 try { if (vI.vIpref.get("hide_sMime_messageSignature")) { 63 60 var element = document.getElementById("menu_securitySign1"); 64 61 if (element.getAttribute("checked") == "true") { … … 70 67 } catch(vErr) { }; 71 68 // code to hide the openGPG signature 72 try { if ( msgIdentityCloneTools._pref.getBoolPref("hide_openPGP_messageSignature")) {69 try { if (vI.vIpref.get("hide_openPGP_messageSignature")) { 73 70 var element = document.getElementById("enigmail_signed_send"); 74 71 if (element.getAttribute("checked") == "true") { -
content/vI_rdfDataEditor.js
rb08078 rd56c39 28 28 Components.utils.import("resource://v_identity/vI_identityData.js", virtualIdentityExtension); 29 29 let Log = vI.setupLogging("virtualIdentity.rdfDataEditor"); 30 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 30 31 31 32 var rdfDataEditor = { … … 102 103 var allHidden = true; 103 104 var hide = (document.getElementById("vI_storageExtras_hideUnusedEditorFields").getAttribute("checked") == "true") 104 let preferences = Components.classes["@mozilla.org/preferences-service;1"]105 .getService(Components.interfaces.nsIPrefService)106 .getBranch("extensions.virtualIdentity.");107 105 rdfDataEditor.__identityData.extras.loopThroughExtras( 108 106 function(extra) { 109 var hidden = hide && ! preferences.getBoolPref(extra.option);107 var hidden = hide && !vI.vIpref.get(extra.option); 110 108 document.getElementById("vI_" + extra.option).setAttribute("hidden", hidden) 111 109 document.getElementById("vI_" + extra.option + "_store").setAttribute("hidden", hidden) -
content/vI_rdfDataTree.js
rb08078 rd56c39 36 36 Components.utils.import("resource://v_identity/vI_identityData.js", virtualIdentityExtension); 37 37 Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension); 38 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 38 39 39 40 //prepares an object for easy comparison against another. for strings, lowercases them … … 213 214 214 215 get _braille() { 215 var prefRoot = Components.classes["@mozilla.org/preferences-service;1"]216 .getService(Components.interfaces.nsIPrefService).getBranch(null);217 216 var braille = false; 218 try { braille = ( prefRoot.getCharPref("accessibility.usebrailledisplay") ||219 prefRoot.getCharPref("accessibility.usetexttospeech")); }217 try { braille = (vI.prefroot.getCharPref("accessibility.usebrailledisplay") || 218 vI.prefroot.getCharPref("accessibility.usetexttospeech")); } 220 219 catch (e) { }; 221 220 return braille; -
content/vI_smartIdentity.js
rb08078 rd56c39 30 30 Components.utils.import("resource://v_identity/vI_identityData.js", virtualIdentityExtension); 31 31 Components.utils.import("resource://v_identity/vI_smartIdentityCollection.js", virtualIdentityExtension); 32 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 32 33 33 34 var smartIdentity = { 34 _pref : Components.classes["@mozilla.org/preferences-service;1"]35 .getService(Components.interfaces.nsIPrefService)36 .getBranch("extensions.virtualIdentity."),37 38 35 messenger : Components.classes["@mozilla.org/messenger;1"].createInstance() 39 36 .QueryInterface(Components.interfaces.nsIMessenger), … … 106 103 Log.debug("__smartIdentitySelection autocreate=" + autocreate + "\n"); 107 104 108 if ( smartIdentity._pref.getBoolPref("idSelection_preferExisting")) {105 if (vI.vIpref.get("idSelection_preferExisting")) { 109 106 var existingIDIndex = smartIdentity._smartIdentityCollection._foundExistingIdentity(); 110 107 if (existingIDIndex) { … … 120 117 Log.debug("__smartIdentitySelection smartIdentity._smartIdentityCollection._allIdentities.number=" + 121 118 smartIdentity._smartIdentityCollection._allIdentities.number + 122 " smartIdentity._pref.getBoolPref('idSelection_ask_always')=" +123 smartIdentity._pref.getBoolPref("idSelection_ask_always") +124 " smartIdentity._pref.getBoolPref('idSelection_ask')=" +125 smartIdentity._pref.getBoolPref("idSelection_ask") + "\n");126 if (!autocreate && smartIdentity._pref.getBoolPref("idSelection_ask") &&127 ((smartIdentity._smartIdentityCollection._allIdentities.number == 1 && smartIdentity._pref.getBoolPref("idSelection_ask_always"))119 " vI.vIpref.get('idSelection_ask_always')=" + 120 vI.vIpref.get("idSelection_ask_always") + 121 " vI.vIpref.get('idSelection_ask')=" + 122 vI.vIpref.get("idSelection_ask") + "\n"); 123 if (!autocreate && vI.vIpref.get("idSelection_ask") && 124 ((smartIdentity._smartIdentityCollection._allIdentities.number == 1 && vI.vIpref.get("idSelection_ask_always")) 128 125 || smartIdentity._smartIdentityCollection._allIdentities.number > 1)) { 129 126 for (var index = 0; index < smartIdentity._smartIdentityCollection._allIdentities.number; index++) { … … 136 133 /* callback: */ smartIdentity.changeIdentityToSmartIdentity).focus(); 137 134 } 138 else if (autocreate || smartIdentity._pref.getBoolPref("idSelection_autocreate")) {135 else if (autocreate || vI.vIpref.get("idSelection_autocreate")) { 139 136 smartIdentity.changeIdentityToSmartIdentity(smartIdentity._smartIdentityCollection._allIdentities, 0); 140 137 } … … 156 153 157 154 __removeSmartIdentityFromRecipients : function(allIdentities, index) { 158 if (! smartIdentity._pref.getBoolPref("idSelection_removeSmartIdentityFromRecipients")) return;155 if (!vI.vIpref.get("idSelection_removeSmartIdentityFromRecipients")) return; 159 156 160 157 // check if selected email is defined as doBcc address. If so, it should not be removed. -
content/vI_statusmenu.js
rb08078 rd56c39 25 25 Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js"); 26 26 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) { 27 28 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 29 27 30 var statusmenu = { 28 prefroot : Components.classes["@mozilla.org/preferences-service;1"]29 .getService(Components.interfaces.nsIPrefService)30 .getBranch(null),31 32 31 objStatusMenu : null, 33 32 objSaveBaseIDMenuItem : null, … … 42 41 observe: function(subject, topic, data) { 43 42 switch (data) { 44 case " extensions.virtualIdentity.fcc_show_switch":45 statusmenu.objFccSwitch.setAttribute("hidden", ! statusmenu.prefroot.getBoolPref(data));43 case "fcc_show_switch": 44 statusmenu.objFccSwitch.setAttribute("hidden", !vI.vIprefs.get(data)); 46 45 // no break, continue like with doFcc 47 case " extensions.virtualIdentity.doFcc":48 statusmenu.objFccSwitch.setAttribute("checked", statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.doFcc"));49 break; 50 case " extensions.virtualIdentity.storage_show_switch":51 statusmenu.objSaveSwitch.setAttribute("hidden", ! statusmenu.prefroot.getBoolPref(data));52 break; 53 case " extensions.virtualIdentity.storage_show_baseID_switch":54 statusmenu.objSaveBaseIDSwitch.setAttribute("hidden", ! statusmenu.prefroot.getBoolPref(data));55 break; 56 case " extensions.virtualIdentity.storage_show_SMTP_switch":57 statusmenu.objSaveSMTPSwitch.setAttribute("hidden", ! statusmenu.prefroot.getBoolPref(data));58 break; 59 case " extensions.virtualIdentity.storage_storedefault":60 statusmenu.objStorageSaveMenuItem.setAttribute("checked", statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage_storedefault"));61 break; 62 case " extensions.virtualIdentity.storage_store_base_id":63 statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", statusmenu.prefroot.getBoolPref(data));64 break; 65 case " extensions.virtualIdentity.storage_store_SMTP":66 statusmenu.objSaveSMTPMenuItem.setAttribute("checked", statusmenu.prefroot.getBoolPref(data));67 break; 68 case " extensions.virtualIdentity.storage_colorIndication":69 document.getElementById("identityHbox").setAttribute("colorize", statusmenu.prefroot.getBoolPref(data))70 document.getElementById("baseIDHbox").setAttribute("colorize", statusmenu.prefroot.getBoolPref(data))71 document.getElementById("smtpServerHbox").setAttribute("colorize", statusmenu.prefroot.getBoolPref(data))72 break; 73 case " extensions.virtualIdentity.storage":74 if ( statusmenu.prefroot.getBoolPref(data)) {46 case "doFcc": 47 statusmenu.objFccSwitch.setAttribute("checked", vI.vIprefs.get("doFcc")); 48 break; 49 case "storage_show_switch": 50 statusmenu.objSaveSwitch.setAttribute("hidden", !vI.vIprefs.get(data)); 51 break; 52 case "storage_show_baseID_switch": 53 statusmenu.objSaveBaseIDSwitch.setAttribute("hidden", !vI.vIprefs.get(data)); 54 break; 55 case "storage_show_SMTP_switch": 56 statusmenu.objSaveSMTPSwitch.setAttribute("hidden", !vI.vIprefs.get(data)); 57 break; 58 case "storage_storedefault": 59 statusmenu.objStorageSaveMenuItem.setAttribute("checked", vI.vIprefs.get("storage_storedefault")); 60 break; 61 case "storage_store_base_id": 62 statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", vI.vIprefs.get(data)); 63 break; 64 case "storage_store_SMTP": 65 statusmenu.objSaveSMTPMenuItem.setAttribute("checked", vI.vIprefs.get(data)); 66 break; 67 case "storage_colorIndication": 68 document.getElementById("identityHbox").setAttribute("colorize", vI.vIprefs.get(data)) 69 document.getElementById("baseIDHbox").setAttribute("colorize", vI.vIprefs.get(data)) 70 document.getElementById("smtpServerHbox").setAttribute("colorize", vI.vIprefs.get(data)) 71 break; 72 case "storage": 73 if (vI.vIprefs.get(data)) { 75 74 statusmenu.objStorageSaveMenuItem.removeAttribute("hidden"); 76 75 statusmenu.objSaveBaseIDMenuItem.removeAttribute("hidden"); … … 90 89 91 90 addObserver: function() { 92 statusmenu.prefroot.addObserver("extensions.virtualIdentity.fcc_show_switch", statusmenu, false);93 statusmenu.prefroot.addObserver("extensions.virtualIdentity.doFcc", statusmenu, false);94 statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage", statusmenu, false);95 statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_switch", statusmenu, false);96 statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_baseID_switch", statusmenu, false);97 statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_SMTP_switch", statusmenu, false);98 statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_colorIndication", statusmenu, false);99 statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_storedefault", statusmenu, false);100 statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_store_base_id", statusmenu, false);101 statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_store_SMTP", statusmenu, false);91 vI.vIprefs.addObserver("fcc_show_switch", statusmenu, false); 92 vI.vIprefs.addObserver("doFcc", statusmenu, false); 93 vI.vIprefs.addObserver("storage", statusmenu, false); 94 vI.vIprefs.addObserver("storage_show_switch", statusmenu, false); 95 vI.vIprefs.addObserver("storage_show_baseID_switch", statusmenu, false); 96 vI.vIprefs.addObserver("storage_show_SMTP_switch", statusmenu, false); 97 vI.vIprefs.addObserver("storage_colorIndication", statusmenu, false); 98 vI.vIprefs.addObserver("storage_storedefault", statusmenu, false); 99 vI.vIprefs.addObserver("storage_store_base_id", statusmenu, false); 100 vI.vIprefs.addObserver("storage_store_SMTP", statusmenu, false); 102 101 }, 103 102 104 103 removeObserver: function() { 105 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.fcc_show_switch", statusmenu);106 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.doFcc", statusmenu);107 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage", statusmenu);108 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_switch", statusmenu);109 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_baseID_switch", statusmenu);110 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_SMTP_switch", statusmenu);111 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_colorIndication", statusmenu);112 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_storedefault", statusmenu);113 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_store_base_id", statusmenu);114 statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_store_SMTP", statusmenu);104 vI.vIprefs.removeObserver("fcc_show_switch", statusmenu); 105 vI.vIprefs.removeObserver("doFcc", statusmenu); 106 vI.vIprefs.removeObserver("storage", statusmenu); 107 vI.vIprefs.removeObserver("storage_show_switch", statusmenu); 108 vI.vIprefs.removeObserver("storage_show_baseID_switch", statusmenu); 109 vI.vIprefs.removeObserver("storage_show_SMTP_switch", statusmenu); 110 vI.vIprefs.removeObserver("storage_colorIndication", statusmenu); 111 vI.vIprefs.removeObserver("storage_storedefault", statusmenu); 112 vI.vIprefs.removeObserver("storage_store_base_id", statusmenu); 113 vI.vIprefs.removeObserver("storage_store_SMTP", statusmenu); 115 114 }, 116 115 117 116 init : function () { 118 statusmenu.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2);119 120 117 statusmenu.objStatusMenu = document.getElementById("virtualIdentityExtension_vIStatusMenu"); 121 118 statusmenu.objSaveBaseIDMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_saveBaseID"); … … 132 129 133 130 statusmenu.addObserver(); 134 statusmenu.observe(null, null, " extensions.virtualIdentity.fcc_show_switch");135 statusmenu.observe(null, null, " extensions.virtualIdentity.storage_show_switch");136 statusmenu.observe(null, null, " extensions.virtualIdentity.storage_show_baseID_switch");137 statusmenu.observe(null, null, " extensions.virtualIdentity.storage_show_SMTP_switch");138 statusmenu.observe(null, null, " extensions.virtualIdentity.storage_colorIndication");139 statusmenu.observe(null, null, " extensions.virtualIdentity.storage_store_base_id");140 statusmenu.observe(null, null, " extensions.virtualIdentity.storage_store_SMTP");141 statusmenu.observe(null, null, " extensions.virtualIdentity.storage_storedefault");142 statusmenu.observe(null, null, " extensions.virtualIdentity.storage");131 statusmenu.observe(null, null, "fcc_show_switch"); 132 statusmenu.observe(null, null, "storage_show_switch"); 133 statusmenu.observe(null, null, "storage_show_baseID_switch"); 134 statusmenu.observe(null, null, "storage_show_SMTP_switch"); 135 statusmenu.observe(null, null, "storage_colorIndication"); 136 statusmenu.observe(null, null, "storage_store_base_id"); 137 statusmenu.observe(null, null, "storage_store_SMTP"); 138 statusmenu.observe(null, null, "storage_storedefault"); 139 statusmenu.observe(null, null, "storage"); 143 140 }, 144 141 … … 187 184 statusmenu.objSaveSMTPMenuItem.removeAttribute("disabled"); 188 185 statusmenu.objSaveBaseIDMenuItem.removeAttribute("disabled"); 189 if ( statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage")) {186 if (vI.vIprefs.get("storage")) { 190 187 if (statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true") save = "base"; 191 188 else save = "ok"; … … 204 201 clicked : function (button) { 205 202 if (button != 0) return; // only react on left mouse button 206 if (! statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage")) return;203 if (!vI.vIprefs.get("storage")) return; 207 204 208 205 var curSaveStatus = (statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true"); -
content/vI_storage.js
rb08078 rd56c39 34 34 let Log = vI.setupLogging("virtualIdentity.storage"); 35 35 Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension); 36 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 36 37 37 38 var storage = { 38 39 focusedElement : null, 39 _pref : Components.classes["@mozilla.org/preferences-service;1"]40 .getService(Components.interfaces.nsIPrefService)41 .getBranch("extensions.virtualIdentity."),42 40 43 41 lastCheckedEmail : {}, // array of last checked emails per row, … … 123 121 AddonManager.getAddonByID("{847b3a00-7ab1-11d4-8f02-006008948af5}", function(addon) { 124 122 if (addon && !addon.userDisabled && !addon.appDisable) { 125 vI. main.preferences.setBoolPref("storageExtras_openPGP_messageEncryption", false)126 vI. main.preferences.setBoolPref("storageExtras_openPGP_messageSignature", false)127 vI. main.preferences.setBoolPref("storageExtras_openPGP_PGPMIME", false)123 vI.vI_prefs.commit("storageExtras_openPGP_messageEncryption", false) 124 vI.vI_prefs.commit("storageExtras_openPGP_messageSignature", false) 125 vI.vI_prefs.commit("storageExtras_openPGP_PGPMIME", false) 128 126 } 129 127 }); … … 132 130 firstUsedInputElement : null, // this stores the first Element for which a Lookup in the Storage was successfull 133 131 updateVIdentityFromStorage: function(inputElement) { 134 if (! storage._pref.getBoolPref("storage"))132 if (!vI.vIprefs.get("storage")) 135 133 { Log.debug("Storage deactivated\n"); return; } 136 134 Log.debug("updateVIdentityFromStorage()\n"); -
content/vI_upgrade.js
rb08078 rd56c39 29 29 Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension); 30 30 Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension); 31 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 31 32 32 33 var upgrade = { 33 preferences : Components.classes["@mozilla.org/preferences-service;1"]34 .getService(Components.interfaces.nsIPrefService)35 .getBranch("extensions.virtualIdentity."),36 37 34 versionChecker : Components.classes["@mozilla.org/xpcom/version-comparator;1"] 38 35 .getService(Components.interfaces.nsIVersionComparator), … … 127 124 128 125 __removeExtraAddedHeaders : function(currentVersion) { 129 var prefroot = Components.classes["@mozilla.org/preferences-service;1"]130 .getService(Components.interfaces.nsIPrefService)131 .getBranch(null);132 133 126 Log.debug("extension-upgrade __removeExtraAddedHeaders " + currentVersion + "\n"); 134 127 if ((!currentVersion || upgrade.versionChecker.compare(currentVersion, "0.6.9") < 0) && 135 prefroot.getCharPref("mailnews.headers.extraExpandedHeaders") != "") {128 vI.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders") != "") { 136 129 // clean extraExpandedHeaders once, because the whole header-saving and restoring was broken too long 137 130 Log.debug("cleaning extraExpandedHeaders\n"); 138 prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", "")131 vI.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", "") 139 132 Log.debug("cleaned extraExpandedHeaders\n"); 140 133 } … … 158 151 Log.debug("transfer changed preferences of pre-" + transferPrefs[i].version + " release:\n") 159 152 for each (transferPref in transferPrefs[i].prefs) { 160 try { upgrade.preferences.setBoolPref(transferPref.targetPref,161 upgrade.preferences.getBoolPref(transferPref.sourcePref));162 upgrade.preferences.clearUserPref(transferPref.sourcePref);153 try { vI.vIprefs.commit(transferPref.targetPref, 154 vI.vIprefs.get(transferPref.sourcePref)); 155 vI.vIprefs.clearUserPref(transferPref.sourcePref); 163 156 Log.debug(".") 164 157 } … … 191 184 Log.debug("removing obsolete preferences of pre-" + obsoletePrefs[i].version + " release:\n") 192 185 for each (pref in obsoletePrefs[i].prefs) { 193 try { upgrade.preferences.clearUserPref(pref); Log.debug(".") }186 try { vI.vIprefs.clearUserPref(pref); Log.debug(".") } 194 187 catch (e) { }; 195 188 } -
content/vI_upgradeOverlay.js
rb08078 rd56c39 28 28 Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension); 29 29 Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension); 30 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 30 31 31 32 var upgradeOverlay = { … … 44 45 rdfDatasource.clean(); 45 46 46 // show error-Console if required47 var prefroot = Components.classes["@mozilla.org/preferences-service;1"]48 .getService(Components.interfaces.nsIPrefService)49 .getBranch(null);50 51 47 Components.utils.import("resource://gre/modules/AddonManager.jsm"); 52 48 … … 56 52 }); 57 53 58 if ( prefroot.getBoolPref("extensions.virtualIdentity.error_console")) {54 if (vI.vIprefs.get("error_console")) { 59 55 document.getElementById("virtualIdentityExtension_vIErrorBoxSplitter").removeAttribute("hidden"); 60 56 document.getElementById("virtualIdentityExtension_vIErrorBox").removeAttribute("hidden"); 61 57 document.getElementById("virtualIdentityExtension_vIErrorBox").setAttribute("class", "console-box"); 62 prefroot.setBoolPref("javascript.options.showInConsole", true);63 prefroot.setBoolPref("browser.dom.window.dump.enabled", true);64 prefroot.setBoolPref("javascript.options.strict", true);58 vI.prefroot.setBoolPref("javascript.options.showInConsole", true); 59 vI.prefroot.setBoolPref("browser.dom.window.dump.enabled", true); 60 vI.prefroot.setBoolPref("javascript.options.strict", true); 65 61 } 66 62 } -
content/v_identity.js
rb08078 rd56c39 28 28 let Log = vI.setupLogging("virtualIdentity.main"); 29 29 Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension); 30 Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension); 30 31 31 32 var main = { 32 prefroot : Components.classes["@mozilla.org/preferences-service;1"]33 .getService(Components.interfaces.nsIPrefService)34 .getBranch(null),35 36 preferences : Components.classes["@mozilla.org/preferences-service;1"]37 .getService(Components.interfaces.nsIPrefService)38 .getBranch("extensions.virtualIdentity."),39 40 33 headerParser : Components.classes["@mozilla.org/messenger/headerparser;1"] 41 34 .getService(Components.interfaces.nsIMsgHeaderParser), … … 124 117 if (!server) continue; 125 118 // check for VirtualIdentity Account 126 try { main.prefroot.getBoolPref("mail.account." + accounts[i].key + ".vIdentity");119 try { vI.prefroot.getBoolPref("mail.account." + accounts[i].key + ".vIdentity"); 127 120 continue; } catch (e) { }; 128 121
Note: See TracChangeset
for help on using the changeset viewer.