Changeset 193c97

Timestamp:

Jul 18, 2009, 5:22:16 PM (12 years ago)

Author:

rene <rene@…>

Branches:

lite_0.1, multiEdit, ng_0.6, ng_0.6_help, ng_0.8, ng_0.9

Children:

d3904b

Parents:

039e6e

Message:

prefDialog optimization

Location:

chrome/content/v_identity

Files:

• vI_helper.js (modified) (1 diff)
• vI_prefDialog.js (modified) (3 diffs)
• vI_prefDialog.xul (modified) (1 diff)

chrome/content/v_identity/vI_helper.js

@@ -52 +52 @@
     },
 
+    extensionActive : function (extensionID) {
+        // seamonkey has no extension-manager, return false in this case
+        if (("nsIExtensionManager" in Components.interfaces) && ("@mozilla.org/extensions/manager;1" in Components.classes)) {
+            var em = Components.classes["@mozilla.org/extensions/manager;1"]
+                .getService(Components.interfaces.nsIExtensionManager);
+            var rdfS = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+            var source = rdfS.GetResource("urn:mozilla:item:"+extensionID);
+            
+            var item = em.getItemForID(extensionID);
+            if (!item || !item.installLocationKey) return false;
+
+            var disabledResource = rdfS.GetResource("http://www.mozilla.org/2004/em-rdf#disabled");
+            var isDisabledResource = rdfS.GetResource("http://www.mozilla.org/2004/em-rdf#isDisabled");
+            var disabled = em.datasource.GetTarget(source, disabledResource, true);
+            if (!disabled) disabled = em.datasource.GetTarget(source, isDisabledResource, true);
+
+            try {
+                disabled=disabled.QueryInterface(Components.interfaces.nsIRDFLiteral);
+                if (disabled.Value=="true") return false;
+            } catch (e) { }
+            return true;
+        }
+        else return false;
+    },
+
 // vI_upgrade.js:229:
 // vI_upgrade.js:232:

chrome/content/v_identity/vI_prefDialog.js

@@ -194 +194 @@
         
         smartReplyHideSignature : function() {
-            // seamonkey has no extension-manager
-            if (("nsIExtensionManager" in Components.interfaces) && ("@mozilla.org/extensions/manager;1" in Components.classes)) {
-                var switch_signature_ID="{2ab1b709-ba03-4361-abf9-c50b964ff75d}"
-                var em = Components.classes["@mozilla.org/extensions/manager;1"]
-                    .getService(Components.interfaces.nsIExtensionManager);
-                var rdfS = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-                var source=rdfS.GetResource("urn:mozilla:item:"+switch_signature_ID)
-                
-                var item = em.getItemForID(switch_signature_ID)
-                if (!item || !item.installLocationKey) return;
-
-                var disabledResource = rdfS.GetResource("http://www.mozilla.org/2004/em-rdf#disabled");
-                var isDisabledResource = rdfS.GetResource("http://www.mozilla.org/2004/em-rdf#isDisabled");
-                var disabled = em.datasource.GetTarget(source, disabledResource, true);
-                if (!disabled) disabled = em.datasource.GetTarget(source, isDisabledResource, true);
-                try {
-                    disabled=disabled.QueryInterface(Components.interfaces.nsIRDFLiteral);
-                    if (disabled.Value=="true") return;
-                } catch (e) { }
-                
+            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");
@@ -261 +243 @@
             document.getElementById("fccReplyFollowsParentBox").setAttribute("hidden", "true");
         }
-//      if (!(typeof(enigSetMenuSettings)=="function")) {
-//          document.getElementById("openPGPencryption").setAttribute("hidden", "true");
-//      }
+        const enigmail_ID="{847b3a00-7ab1-11d4-8f02-006008948af5}"
+        if (!vI_helper.extensionActive(enigmail_ID))
+            document.getElementById("openPGPencryption").setAttribute("hidden", "true");
 
         vI_prefDialog.base.smartReplyConstraint(document.getElementById("VIdent_identity.smart_reply"));
@@ -269 +251 @@
         vI_prefDialog.base.storageConstraint(document.getElementById("VIdent_identity.storage"));
         vI_prefDialog.base.constraints();
-        if (vI_storageExtrasHelper.seamonkey_to_old())
-            document.getElementById("storageTab2").setAttribute("hidden", "true")
+        if (vI_storageExtrasHelper.seamonkey_to_old()) {
+            document.getElementById("storageExtrasTreeitem1").setAttribute("hidden", "true")
+            document.getElementById("storageExtrasTreeitem2").setAttribute("hidden", "true")
+        }
     },
     

chrome/content/v_identity/vI_prefDialog.xul

@@ -519 +519 @@
                 </treechildren>
             </treeitem>
-            <treeitem><treerow><treecell label="&vI_prefDialog.storageTab.Tab1.label;" /></treerow></treeitem>
-            <treeitem><treerow><treecell label="&vI_prefDialog.storageTab.Tab2.label;" /></treerow></treeitem>
+            <treeitem id="storageExtrasTreeitem1"><treerow><treecell label="&vI_prefDialog.storageTab.Tab1.label;" /></treerow></treeitem>
+            <treeitem id="storageExtrasTreeitem2"><treerow><treecell label="&vI_prefDialog.storageTab.Tab2.label;" /></treerow></treeitem>
         </treechildren>
         </tree>