Changeset acf7ad

Timestamp:

Aug 25, 2018, 12:04:24 PM (2 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

d0fa65

Parents:

ee2df4

Message:

added way to take over contents of identityData, added accountkey to idObj

File:

• modules/vI_identityData.js (modified) (4 diffs)

modules/vI_identityData.js

@@ -169 +169 @@
     return new identityData(this._currentWindow, this.email, this.fullName, this.id.key, this.smtp.key, this.extras ? this.extras.getDuplicate() : null,
       this.sideDescription, this.existingID);
+  },
+  
+  takeOverAvailableData: function(identityData) {
+    if (identityData.email)
+      this.email = identityData.email;
+    if (identityData.fullName)
+      this.fullName = identityData.fullName;
+    if (identityData.id.key)
+      this.id.key = identityData.id.key;
+    if (identityData.smtp.key)
+      this.smtp.key = identityData.smtp.key;
+    if (identityData.sideDescription)
+      this.sideDescription = identityData.sideDescription;
+    if (identityData.extras)
+      this.extras.copy(identityData.extras);
   },
 
@@ -447 +462 @@
   _key: null,
   _value: null,
+  _accountkey: null,
 
   set key(key) {
@@ -455 +471 @@
     if (this._value == null) var dummy = this.value;
     return this._key
+  },
+  get accountkey() {
+    if (this._value == null) var dummy = this.value;
+    return this._accountkey
   },
   get value() {
@@ -470 +490 @@
           if (this._key == identity.key) {
             this._value = identity.identityName;
+            this._accountkey = account.key;
             break;
           }
         }
       }
-      if (!this._value) this._key = null;
+      if (!this._value) {
+        this._key = null;
+        this._accountkey = null;
+      }
     }
     return this._value;