Changeset 67ba6a for chrome/content/v_identity/vI_storage.js

Timestamp:

Sep 16, 2008, 2:21:41 AM (14 years ago)

Author:

rene <rene@…>

Branches:

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

Children:

b3755b

Parents:

97d350

Message:

some bugfixes, updates

File:

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

chrome/content/v_identity/vI_storage.js

@@ -36 +36 @@
     this.id = (this.__keyTranslator.isValidID(id))?id:"";
     this.smtp = (this.__keyTranslator.isValidSMTP(smtp))?smtp:""
-    this.extras = extras;
+    this.extras = extras?extras:new vI_storageExtras();
     this.comp = {   // holds the results of the last comparison for later creation of a compareMatrix
         compareID : null,
@@ -94 +94 @@
     // creates an Duplicate of the current IdentityData, cause usually we are working with a pointer
     getDuplicate : function() {
-        var newExtras = this.extras?this.extras.getDuplicate():null;
-        return new identityData(this.email, this.fullName, this.id, this.smtp, newExtras, this.sideDescription);
+        return new identityData(this.email, this.fullName, this.id, this.smtp, this.extras.getDuplicate(), this.sideDescription);
     },
 
@@ -141 +140 @@
 
     __equalsIdentity : function(identity) {
-        var newExtras = new vI_storageExtras();
-        newExtras.readValues(identity);
         var testIdentity = new identityData(
             identity.email,
             identity.fullName,
             identity.key,
-            identity.smtpServerKey, newExtras)
+            identity.smtpServerKey)
+        testIdentity.extras.readIdentityValues(identity);
         return (this.equals(testIdentity));
     },
@@ -158 +156 @@
         this.comp.equals.smtpName = this.__equalSMTP(compareIdentityData.smtp);
         this.comp.equals.idName = this.__equalID(compareIdentityData.id);
-        this.comp.equals.extras = (!this.extras || !compareIdentityData.extras || this.extras.equal(compareIdentityData.extras))
+        this.comp.equals.extras = this.extras.equal(compareIdentityData.extras);
 
         return (this.comp.equals.fullName && this.comp.equals.email && this.comp.equals.smtpName && this.comp.equals.idName && this.comp.equals.extras)
@@ -195 +193 @@
             string += "<tr><td class='col1'>" + this[item+"Label"] + ":</td>" +
                 "<td class='col2'>" + this[item+"Html"] + "</td></tr>"
-        if (this.extras) string += this.extras.getMatrix();
+        string += this.extras.getMatrix();
         return string;      
     }