Changeset ee2df4

Timestamp:

Aug 25, 2018, 12:03:23 PM (2 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

acf7ad

Parents:

fab458

Message:

added new send-types, smaller fixes

File:

• modules/vI_smartIdentity.js (modified) (8 diffs)

modules/vI_smartIdentity.js

@@ -58 +58 @@
     var msgHdr;
     var msgComposeTypeReference = Components.interfaces.nsIMsgCompType;
-    Log.debug("this._document.title=" + this._document.title + " this._msgCompose=" + this._msgCompose + " msgIdentityClone=" + this._document.getElementById("virtualIdentityExtension_msgIdentityClone"))
+    Log.debug("this._document.title=" + this._document.title + " this._msgCompose=" + this._msgCompose + " msgIdentityClone=" + this._document.getElementById("msgIdentity"))
 
     var newsgroup = this._msgCompose.compFields.newsgroups;
@@ -71 +71 @@
     case msgComposeTypeReference.ReplyWithTemplate:
     case msgComposeTypeReference.ReplyToList:
+    case msgComposeTypeReference.ReplyIgnoreQuote:
       Log.debug("Reply");
       msgHdr = this.messenger.
       messageServiceFromURI(this._msgCompose.originalMsgURI).messageURIToMsgHdr(this._msgCompose.originalMsgURI);
-      this._smartIdentityCollection = new smartIdentityCollection(this._currentWindow, msgHdr, this._currentWindow.getCurrentIdentity(), this._document.getElementById("virtualIdentityExtension_msgIdentityClone").vid,
+      this._smartIdentityCollection = new smartIdentityCollection(this._currentWindow, msgHdr, this._currentWindow.getCurrentIdentity(), this._document.getElementById("msgIdentity").vid,
         newsgroup, this._getRecipients());
       this._smartIdentityCollection.Reply();
@@ -84 +85 @@
       msgHdr = this.messenger.
       messageServiceFromURI(this._msgCompose.compFields.draftId).messageURIToMsgHdr(this._msgCompose.compFields.draftId);
-      this._smartIdentityCollection = new smartIdentityCollection(this._currentWindow, msgHdr, this._currentWindow.getCurrentIdentity(), this._document.getElementById("virtualIdentityExtension_msgIdentityClone").vid,
+      this._smartIdentityCollection = new smartIdentityCollection(this._currentWindow, msgHdr, this._currentWindow.getCurrentIdentity(), this._document.getElementById("msgIdentity").vid,
         newsgroup, this._getRecipients());
       this._smartIdentityCollection.Draft();
@@ -94 +95 @@
     case msgComposeTypeReference.NewsPost:
     case msgComposeTypeReference.MailToUrl:
+    case msgComposeTypeReference.EditAsNew:
+    case msgComposeTypeReference.EditTemplate:
       Log.debug("New Mail");
-      this._smartIdentityCollection = new smartIdentityCollection(this._currentWindow, null, this._currentWindow.getCurrentIdentity(), this._document.getElementById("virtualIdentityExtension_msgIdentityClone").vid,
+      this._smartIdentityCollection = new smartIdentityCollection(this._currentWindow, null, this._currentWindow.getCurrentIdentity(), this._document.getElementById("msgIdentity").vid,
         newsgroup, this._getRecipients());
       // to enable composing new email with new identity: identity is hidden in subject line
@@ -109 +112 @@
       break;
     }
-    if (this._smartIdentityCollection._allIdentities.number > 0) this.__smartIdentitySelection(autocreate);
+    if (this._smartIdentityCollection &&
+      this._smartIdentityCollection._allIdentities.number > 0) this.__smartIdentitySelection(autocreate);
   },
 
@@ -136 +140 @@
         Log.debug("found existing Identity, use without interaction.");
         // add all Indentities to Clone Menu before selecting and leaving the function
-        this._document.getElementById("virtualIdentityExtension_msgIdentityClone").addIdentitiesToCloneMenu(this._smartIdentityCollection._allIdentities);
+        this._document.getElementById("msgIdentity").addIdentitiesToCloneMenu(this._smartIdentityCollection._allIdentities);
         this.changeIdentityToSmartIdentity(this, existingIDIndex.key);
         return;
@@ -142 +146 @@
     }
 
-    this._document.getElementById("virtualIdentityExtension_msgIdentityClone").addIdentitiesToCloneMenu(this._smartIdentityCollection._allIdentities);
+    this._document.getElementById("msgIdentity").addIdentitiesToCloneMenu(this._smartIdentityCollection._allIdentities);
+    
+    
     Log.debug("__smartIdentitySelection _allIdentities.number=" +
       this._smartIdentityCollection._allIdentities.number +
@@ -167 +173 @@
     Log.debug("changeIdentityToSmartIdentity selectedValue=" + selectedValue + " from " + allIdentities.number);
     Log.debug("changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' " + "(" + allIdentities.identityDataCollection[selectedValue].id.value + "," + allIdentities.identityDataCollection[selectedValue].smtp.value + ")");
-    self._document.getElementById("virtualIdentityExtension_msgIdentityClone").selectedMenuItem = allIdentities.menuItems[selectedValue];
-    if (self._document.getElementById("virtualIdentityExtension_msgIdentityClone").vid) {
+    
+//     allIdentities.menuItems[selectedValue].setAttribute("accountkey", 
+//                                                         self._document.getElementById("msgIdentity").selectedMenuItem.accountkey);
+//     allIdentities.menuItems[selectedValue].setAttribute("identitykey",  
+//                                                         self._document.getElementById("msgIdentity").selectedMenuItem.identitykey);
+    self._document.getElementById("msgIdentity").selectedMenuItem = allIdentities.menuItems[selectedValue];
+    if (self._document.getElementById("msgIdentity").vid) {
       var label = self.stringBundle.GetStringFromName("vident.smartIdentity.vIUsage");
       if (allIdentities.number > 1) label += " " + self.stringBundle.GetStringFromName("vident.smartIdentity.moreThanOne");