Changeset d9af4a

Timestamp:

Nov 14, 2011, 10:25:34 AM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

67fe6b

Parents:

db5435

Message:

removed unused helper, used asynchronous calls instead

Location:

content

Files:

• modules/vI_helper.js (deleted)
• prefDialog/vI_prefDialog.js (modified) (3 diffs)
• prefDialog/vI_prefDialog.xul (modified) (2 diffs)
• vI_storage.js (modified) (2 diffs)
• vI_upgrade.js (modified) (1 diff)
• vI_upgradeOverlay.js (modified) (1 diff)

content/prefDialog/vI_prefDialog.js

@@ -24 +24 @@
 
 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+
+Components.utils.import("resource://gre/modules/AddonManager.jsm");
+
 var prefDialog = {
     toggleHelp : function() {
@@ -237 +240 @@
         
         smartReplyHideSignature : function() {
-            const switch_signature_ID="{2ab1b709-ba03-4361-abf9-c50b964ff75d}"
-            if (vI.helper.extensionActive(switch_signature_ID)) {
-                document.getElementById("VIdent_identity.HideSignature.warning").setAttribute("hidden", "true");
-                document.getElementById("VIdent_identity.hide_signature").setAttribute("disabled", "false");
-            }
+          // check for signature_switch extension
+          AddonManager.getAddonByID("{2ab1b709-ba03-4361-abf9-c50b964ff75d}", function(addon) {
+            if (addon && !addon.userDisabled && !addon.appDisable) {
+                document.getElementById("VIdent_identity.HideSignature.warning").setAttribute("hidden", "true");
+                document.getElementById("VIdent_identity.hide_signature").setAttribute("disabled", "false");
+            }
+          }); 
         },
         
@@ -309 +314 @@
         vI.onInitCopiesAndFolders()
 
-        const enigmail_ID="{847b3a00-7ab1-11d4-8f02-006008948af5}"
-        if (!vI.helper.extensionActive(enigmail_ID)) {
-            document.getElementById("openPGPencryption").setAttribute("hidden", "true");
-            document.getElementById("VIdent_identity.hide_openPGP_messageSignature").setAttribute("hidden", "true");
-        }
-        
+        // check for enigmail extension
+        AddonManager.getAddonByID("{847b3a00-7ab1-11d4-8f02-006008948af5}", function(addon) {
+          if (addon && !addon.userDisabled && !addon.appDisable) {
+            document.getElementById("openPGPencryption").removeAttribute("hidden");
+            document.getElementById("VIdent_identity.hide_openPGP_messageSignature").removeAttribute("hidden");
+          }
+        }); 
+
         prefDialog.base.smartReplyConstraint(document.getElementById("VIdent_identity.smart_reply"));
         prefDialog.base.smartReplyHideSignature();

content/prefDialog/vI_prefDialog.xul

@@ -364 +364 @@
                         prefstring="hide_sMime_messageSignature"/>
                     <checkbox id="VIdent_identity.hide_openPGP_messageSignature" label="&vI_prefDialog.composeDialog.HideOpenPGPSignature.label;"
-                        prefstring="hide_openPGP_messageSignature"/>
+                        prefstring="hide_openPGP_messageSignature" hidden="true"/>
                     <checkbox id="VIdent_identity.autoReplyToSelf" label="&vI_prefDialog.composeDialog.autoReplyToSelf.label;"
                         prefstring="autoReplyToSelf"/>
@@ -658 +658 @@
                     <checkbox id="VIdent_identity.storageExtras_sMime_messageSignature" label="&vI_prefDialog.storageExtras.sMime.messageSignature.label;"
                         prefstring="storageExtras_sMime_messageSignature"/>
-                    </vbox><spacer flex="1"/><vbox id="openPGPencryption">
+                    </vbox><spacer flex="1"/><vbox id="openPGPencryption" hidden="true">
                     <label value="&vI_prefDialog.storageExtras.openPGP.label;"/>
                     <checkbox id="VIdent_identity.storageExtras_openPGP_messageEncryption" label="&vI_prefDialog.storageExtras.openPGP.messageEncryption.label;"

content/vI_storage.js

@@ -29 +29 @@
 
 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+
+Components.utils.import("resource://gre/modules/AddonManager.jsm");
+
 var storage = {
     focusedElement : null,
@@ -115 +118 @@
 
         // reset unavailable storageExtras preferences
-        const enigmail_ID="{847b3a00-7ab1-11d4-8f02-006008948af5}"
-        if (!vI.helper.extensionActive(enigmail_ID)) {
-            vI.main.preferences.setBoolPref("storageExtras_openPGP_messageEncryption", false)
-            vI.main.preferences.setBoolPref("storageExtras_openPGP_messageSignature", false)
-            vI.main.preferences.setBoolPref("storageExtras_openPGP_PGPMIME", false)
-        }
-    },
-    
+        AddonManager.getAddonByID("{847b3a00-7ab1-11d4-8f02-006008948af5}", function(addon) {
+          if (addon && !addon.userDisabled && !addon.appDisable) {
+            vI.main.preferences.setBoolPref("storageExtras_openPGP_messageEncryption", false)
+            vI.main.preferences.setBoolPref("storageExtras_openPGP_messageSignature", false)
+            vI.main.preferences.setBoolPref("storageExtras_openPGP_PGPMIME", false)
+          }
+        }); 
+    },
     
     firstUsedInputElement : null,   // this stores the first Element for which a Lookup in the Storage was successfull

content/vI_upgrade.js

@@ -172 +172 @@
                     "storage_use_for_smart_reply") },
                     { version : "0.5.3", prefs : Array("storage_use_for_smart_reply") },
-                    { version : "0.5.6", prefs : Array("copyEnigmailSettings") } ];
+                    { version : "0.5.6", prefs : Array("copyEnigmailSettings") },
+                    { version: "0.9", prefs : Array("extensions.virtualIdentity.{2ab1b709-ba03-4361-abf9-c50b964ff75d}",
+                                                    "extensions.virtualIdentity.{847b3a00-7ab1-11d4-8f02-006008948af5}",
+                                                    "extensions.virtualIdentity.smart_reply_added_extraHeaders",
+                                                    "mailnews.headers.extraExpandedHeaders") }
+                    ];
         // remove obsolete preference-tree virtualIdentity
         for (var i = 0; i < obsoletePrefs.length; i++) {

content/vI_upgradeOverlay.js

@@ -46 +46 @@
         Components.utils.import("resource://gre/modules/AddonManager.jsm");  
 
-        const switch_signature_ID="{2ab1b709-ba03-4361-abf9-c50b964ff75d}"      
-        prefroot.setBoolPref("extensions.virtualIdentity." + switch_signature_ID, false)
-        AddonManager.getAddonByID(switch_signature_ID, function(addon) {
-            if (addon) prefroot.setBoolPref("extensions.virtualIdentity." + switch_signature_ID, addon.userDisabled || addon.appDisabled ? false : true)
-        }); 
-        
-        const enigmail_ID="{847b3a00-7ab1-11d4-8f02-006008948af5}"
-        prefroot.setBoolPref("extensions.virtualIdentity." + enigmail_ID, false)
-        AddonManager.getAddonByID(enigmail_ID, function(addon) {
-            if (addon) prefroot.setBoolPref("extensions.virtualIdentity." + enigmail_ID, addon.userDisabled || addon.appDisabled ? false : true)
-        }); 
-        
         const virtualIdentity_ID="{dddd428e-5ac8-4a81-9f78-276c734f75b8}"
         AddonManager.getAddonByID(virtualIdentity_ID, function(addon) {