Changeset b9a8f87

Timestamp:

Jul 21, 2008, 12:25:36 PM (12 years ago)

Author:

rene <rene@…>

Branches:

master

Children:

b13a12

Parents:

ff647c

Message:

simplified version comparison

Location:

chrome/content/v_identity

Files:

• vI_helper.js (modified) (1 diff)
• vI_prefDialog.js (modified) (1 diff)
• vI_prefDialog.xul (modified) (1 diff)
• vI_storageExtras.js (modified) (1 diff)
• v_identity.js (modified) (1 diff)

chrome/content/v_identity/vI_helper.js

@@ -65 +65 @@
 
 var vI_helper = {
+    // simplified versionChecker, type is "TB" or "SM"
+    // returns true if appVersion is smaller or equal version
+    olderVersion : function (type, version) {
+        var appID = null; var appVersion = null;
+        const THUNDERBIRD_ID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
+        const SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
+
+        var versionChecker;
+        if("@mozilla.org/xre/app-info;1" in Components.classes) {
+            var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+                .getService(Components.interfaces.nsIXULAppInfo);
+            appID = appInfo.ID
+            appVersion = appInfo.version
+        }
+        if ((type == "TB" && appID != THUNDERBIRD_ID) ||
+            (type == "SM" && appID != SEAMONKEY_ID)) return null;
+
+        if (!version) return ((type == "TB" && appID == THUNDERBIRD_ID) ||
+            (type == "SM" && appID == SEAMONKEY_ID))
+
+        if("@mozilla.org/xpcom/version-comparator;1" in Components.classes)
+            versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
+                .getService(Components.interfaces.nsIVersionComparator);
+        else return null;
+        
+        return (versionChecker.compare(appVersion, version) < 0)
+    },
+
     // "accountname" property changed in Thunderbird 3.x, Seamonkey 1.5x to "description"
     getAccountname: function(elem) {

chrome/content/v_identity/vI_prefDialog.js

@@ -273 +273 @@
         onInitCopiesAndFolders()
 
-        var appID = null;
-        var appVersion = null;
-        var versionChecker;
-        if("@mozilla.org/xre/app-info;1" in Components.classes) {
-            var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
-                .getService(Components.interfaces.nsIXULAppInfo);
-            appID = appInfo.ID
-            appVersion = appInfo.version
-        }
-        if("@mozilla.org/xpcom/version-comparator;1" in Components.classes)
-            versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
-                .getService(Components.interfaces.nsIVersionComparator);
-        else appID = null;
-        const THUNDERBIRD_ID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
-        const SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
-        if ((!appID) || (appID == THUNDERBIRD_ID && versionChecker.compare(appVersion, "2.0b") < 0) ||
-            (appID == SEAMONKEY_ID && versionChecker.compare(appVersion, "1.5a") < 0)) {
+        if (vI_helper.olderVersion("TB", "2.0b") || vI_helper.olderVersion("SM", "1.5a")) {
             document.getElementById("version-warning").setAttribute("hidden", "false");
             document.getElementById("VIdent_identity.smart_draft").setAttribute("disabled", "true");
         }
-        if ((!appID) || (appID == THUNDERBIRD_ID && versionChecker.compare(appVersion, "1.5.0.7") < 0)) {
+        if (vI_helper.olderVersion("TB", "1.5.0.7")) {
             document.getElementById("notificationGroupBox").setAttribute("hidden", "true"); 
         }
-        if ((!appID) || (appID == THUNDERBIRD_ID && versionChecker.compare(appVersion, "2.0") < 0)) {
+        if (vI_helper.olderVersion("TB", "2.0")) {
             document.getElementById("fccReplyFollowsParentBox").setAttribute("hidden", "true");
         }
-        if ((!appID) || (appID != THUNDERBIRD_ID)) {
+        if (vI_helper.olderVersion("SM", null)) { // any known seamonkey version
             document.getElementById("VIdent_identity.menu_entry").setAttribute("hidden", "true");
         }

chrome/content/v_identity/vI_prefDialog.xul

@@ -55 +55 @@
 <script type="application/x-javascript"
             src="chrome://v_identity/content/vI_storageExtras.js" />
+<script type="application/x-javascript"
+            src="chrome://v_identity/content/vI_helper.js" />
 
   <stringbundleset id="stringbundleset">

chrome/content/v_identity/vI_storageExtras.js

@@ -62 +62 @@
 
     seamonkey_to_old : function() {
-        if (vI_storageExtrasHelper.seamonkey_old == "true") return true;
-        var versionChecker;
-        if("@mozilla.org/xre/app-info;1" in Components.classes) {
-            var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
-                .getService(Components.interfaces.nsIXULAppInfo);
-            appID = appInfo.ID
-            appVersion = appInfo.version
-        }
-        if("@mozilla.org/xpcom/version-comparator;1" in Components.classes)
-            versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
-                .getService(Components.interfaces.nsIVersionComparator);
-        else appID = null;
-        const SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
-        if (appID == SEAMONKEY_ID && versionChecker.compare(appVersion, "1.5a") < 0)
-            vI_storageExtrasHelper.seamonkey_old = "true"
-        return (vI_storageExtrasHelper.seamonkey_old == "true")
+        if (vI_storageExtrasHelper.seamonkey_old != "true")
+            vI_storageExtrasHelper.seamonkey_old = vI_helper.olderVersion("SM", "1.5a")
+        return (vI_storageExtrasHelper.seamonkey_old)   
     }
 }

chrome/content/v_identity/v_identity.js

@@ -131 +131 @@
             vI_notificationBar.dump("## v_identity: VIdentity_GenericSendMessage\n");
             vI.msgType = msgType; 
+            
             // dont allow user to fake identity if Message is not sended NOW and thunderbird-version is below 2.0 !!!!
-            var appID = null;
-            var appVersion = null;
-            var versionChecker;
-            if("@mozilla.org/xre/app-info;1" in Components.classes) {
-                var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
-                    .getService(Components.interfaces.nsIXULAppInfo);
-                appID = appInfo.ID
-                appVersion = appInfo.version
-            }
-            if("@mozilla.org/xpcom/version-comparator;1" in Components.classes)
-                versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
-                    .getService(Components.interfaces.nsIVersionComparator);
-            else appID = null;
-            const THUNDERBIRD_ID = "{3550f703-e582-4d05-9a08-453d09bdfdc6}";
-            const SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
             if (msgType != nsIMsgCompDeliverMode.Now &&
-                ((!appID) || (appID == THUNDERBIRD_ID && versionChecker.compare(appVersion, "2.0b") < 0) ||
-                (appID == SEAMONKEY_ID && versionChecker.compare(appVersion, "1.5a") < 0))) {
+                ((vI_helper.olderVersion("TB", "2.0b") || vI_helper.olderVersion("SM", "1.5a"))) {
                 var server = gAccountManager.defaultAccount.incomingServer.prettyName
                 var name = gAccountManager.defaultAccount.defaultIdentity.fullName