Changeset e21b59

Timestamp:

Apr 19, 2008, 3:03:17 PM (14 years ago)

Author:

rene <rene@…>

Branches:

master

Children:

aa47dc

Parents:

4dfe1d

Message:

moved comparison of StorageData? to identityData-Object.
modified onblur and oncommand-Settings

File:

• chrome/content/v_identity/vI_storage.js (modified) (6 diffs)

chrome/content/v_identity/vI_storage.js

@@ -40 +40 @@
     email : null,
     fullName : null,
-    id_key : null,
-    smtp_key : null,
+    id : null,
+    smtp : null,
     extras : null,
     __keyTranslator : null,
     __combineStrings : function(stringA, stringB) {
-        var A = stringA.replace(/^\s+|\s+$/g,"");
-        var B = stringB.replace(/^\s+|\s+$/g,"");
+        var A = (stringA)?stringA.replace(/^\s+|\s+$/g,""):"";
+        var B = (stringB)?stringB.replace(/^\s+|\s+$/g,""):"";
         if (!A) return B;
         if (!B) return A;
@@ -58 +58 @@
         return senderName + " (" + 
             this.__combineStrings(this.__combineStrings(idName, smtpName), extras) +  ")"
+    },
+    __equalCurrentSMTP : function() {
+        var smtp_key = vI_smtpSelector.elements.Obj_SMTPServerList.selectedItem.getAttribute('key');
+        return (!this.__keyTranslator.getSMTP(this.smtp) && !smtp_key ||
+            smtp_key == this.smtp)
+    },
+    __equalCurrentID : function() {
+        var id_key = vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.getAttribute("oldvalue");
+        if (!id_key) id_key = vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.getAttribute("value");
+        return ((!this.__keyTranslator.getID(this.id) && (id_key == gAccountManager.defaultAccount.defaultIdentity.key)) ||
+            id_key == this.id)
+    },
+    equalsCurrentIdentity : function() {
+        var curAddress = vI_helper.getAddress();        
+        var curExtras = new vI_storageExtras();
+        curExtras.readValues(); // initialize with current MsgComposeDialog Values
+        
+        var equal = (   (this.__equalCurrentID()) &&
+                (this.__equalCurrentSMTP()) &&
+                (curAddress.email == this.email) &&
+                (curAddress.name == this.fullName) &&
+                (this.extras.equal(curExtras))  )
+        if (equal) vI_notificationBar.dump("## identityData: Identities are the same.\n")
+        else vI_notificationBar.dump("## identityData: Identities differ.\n")
+        return equal;
     }
 }
@@ -150 +175 @@
             // see https://bugzilla.mozilla.org/show_bug.cgi?id=355367
             // same seems to happen with the ondragdrop event
-            awGetInputElement(1).setAttribute("onblur",
-                "window.setTimeout(vI_storage.awOnBlur, 250, this.parentNode.parentNode.parentNode);")
-            awGetPopupElement(1).setAttribute("oncommand",
-                "window.setTimeout(vI_storage.awPopupOnCommand, 250, this);")
+            for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
+                var input = awGetInputElement(row);
+                if (input) {
+                    var oldBlur = input.getAttribute("onblur")
+                    input.setAttribute("onblur", (oldBlur?oldBlur+"; ":"") +
+                        "window.setTimeout(vI_storage.awOnBlur, 250, this.parentNode.parentNode.parentNode);")
+                }
+                var popup = awGetPopupElement(row);
+                if (popup) {
+                    var oldCommand = popup.getAttribute("oncommand")
+                    popup.setAttribute("oncommand", (oldCommand?oldCommand+"; ":"") +
+                        "window.setTimeout(vI_storage.awPopupOnCommand, 250, this);")
+                }
+            }
         }
         vI_storage.original_functions.awSetInputAndPopupValue = awSetInputAndPopupValue;
@@ -217 +252 @@
         }
         // only update fields if new Identity is different than old one.
-        else if (!vI_storage.__equalsCurrentIdentity(storageData)) {
+        else if (!storageData.equalsCurrentIdentity()) {
             // add Identity to dropdown-menu
             vI_msgIdentityClone.addIdentityToCloneMenu(
@@ -245 +280 @@
         else return { recDesc : recipient, recType : "email" }
     },
-    
-    __equalsCurrentIdentity : function(storageData) {
-        var curAddress = vI_helper.getAddress();        
-        var id_key = vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.getAttribute("oldvalue");
-        if (!id_key) id_key = vI_msgIdentityClone.elements.Obj_MsgIdentity_clone.getAttribute("value");
-        var smtp_key = vI_smtpSelector.elements.Obj_SMTPServerList.selectedItem.getAttribute('key');
-        var extras = new vI_storageExtras();
-        extras.readValues(); // initialize with current MsgComposeDialog Values
-
-        var equal = (   (id_key == storageData.id) &&
-                (smtp_key == storageData.smtp) &&
-                (curAddress.email == storageData.email) &&
-                (curAddress.name == storageData.fullName) &&
-                (extras.equal(storageData.extras))  )
-        if (equal) vI_notificationBar.dump("## vI_storage: Identities are the same.\n")
-        else vI_notificationBar.dump("## vI_storage: Identities differ.\n")
-        return equal;
-    },
-    
+        
     storeVIdentityToAllRecipients : function(msgType) {
         if (msgType != nsIMsgCompDeliverMode.Now) return;
@@ -354 +371 @@
         var storageData = vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
         if (storageData) {
-            if (!vI_storage.__equalsCurrentIdentity(storageData) &&
+            if (!storageData.equalsCurrentIdentity(storageData) &&
                 !dontUpdateMultipleNoEqual) {
                 var warning = vI_storage.__getOverwriteStorageWarning(recipient, storageData);