Changeset 290dde

Timestamp:

Feb 17, 2015, 11:57:35 AM (8 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

081ae7

Parents:

dcfdfa

Message:

allow in-between changes of account settings without causing trouble

Files:

• content/accountManagerOverlays/vI_am-Overlay.xul (modified) (1 diff)
• content/accountManagerOverlays/vI_am-smtpOverlay.xul (modified) (1 diff)
• content/bindings/v_identity.xml (modified) (2 diffs)
• content/v_identity.js (modified) (2 diffs)
• modules/vI_rdfDatasource.js (modified) (2 diffs)

content/accountManagerOverlays/vI_am-Overlay.xul

@@ -25 +25 @@
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <script type="application/x-javascript" src="chrome://v_identity/content/vI_am-Overlay.js"/>
+    <script type="application/x-javascript" src="chrome://v_identity/content/accountManagerOverlays/vI_am-Overlay.js"/>
 </overlay>

content/accountManagerOverlays/vI_am-smtpOverlay.xul

@@ -25 +25 @@
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <script type="application/x-javascript" src="chrome://v_identity/content/vI_am-smtpOverlay.js"/>
+    <script type="application/x-javascript" src="chrome://v_identity/content/accountManagerOverlays/vI_am-smtpOverlay.js"/>
 </overlay>

content/bindings/v_identity.xml

@@ -367 +367 @@
                     this._msgIdentityElem.selectedItem = MenuItems[index];
                     this._msgIdentityElem.value = MenuItems[index].getAttribute("value");
+          this._msgIdentityPopupElem.doCommand();
                     break;
                 }
             }
-            this._msgIdentityPopupElem.doCommand();
         }
         this.identityData = this.selectedMenuItem.identityData.getDuplicate();
@@ -378 +378 @@
             this.identityData.smtp.key = this._AccountManager.getIdentity(this.value).smtpServerKey;
             document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this.identityData.smtp.keyNice;
-            this.checkForVirtualIdentity();
-        }
+        }
+    this.checkForVirtualIdentity();
     ]]></body>
     </method>   

content/v_identity.js

@@ -36 +36 @@
     Components.utils.import("resource://v_identity/vI_smartIdentity.js", virtualIdentityExtension);
     Components.utils.import("resource://v_identity/vI_log.js", virtualIdentityExtension);
+    Components.utils.import("resource:///modules/mailServices.js");
 
     var main = {
@@ -418 +419 @@
           if (topic == "am-acceptChanges") {
             Log.debug("account changes observed");
-            document.getElementById("virtualIdentityExtension_msgIdentityClone").clean();
-            document.getElementById("virtualIdentityExtension_msgIdentityClone").init();
+            Log.debug("cleaning original msgIdentityPopup");
+            var MenuItems = main.elements.Obj_MsgIdentityPopup.childNodes;
+            while (MenuItems.length > 0) {
+              try {MenuItems[0].clean();} catch (e) { };
+              main.elements.Obj_MsgIdentityPopup.removeChild(MenuItems[0])
+            }
+            main.replacement_functions.FillIdentityList(main.elements.Obj_MsgIdentity)
+            let virtualIdentityExtension_msgIdentityClone = document.getElementById("virtualIdentityExtension_msgIdentityClone")
+            let tmp_identity = virtualIdentityExtension_msgIdentityClone.identityData;
+            virtualIdentityExtension_msgIdentityClone.clean();
+            virtualIdentityExtension_msgIdentityClone.init();
+            Log.debug("cleaning original msgIdentityPopup done.");
+            tmp_identity.existingID = tmp_identity.isExistingIdentity(false)
+            if (tmp_identity.existingID) {
+              tmp_identity.id.key = tmp_identity.existingID
+            } else {
+              tmp_identity.id.key = MailServices.accounts.defaultAccount.defaultIdentity.key
+            }
+            Log.debug("adding previous identity to msgIdentityClone");
+            virtualIdentityExtension_msgIdentityClone.selectedMenuItem = virtualIdentityExtension_msgIdentityClone.addIdentityToCloneMenu(tmp_identity);
+            Log.debug("adding previous identity to msgIdentityClone done.");
           }
         },

modules/vI_rdfDatasource.js

@@ -69 +69 @@
   this._rdfFileName = rdfFileName;
   if (this._rdfFileName) this.init();
-  if (!dontRegisterObserver) this.AccountManagerObserver.register();
+  if (!dontRegisterObserver) this.AccountManagerObserver.register(this);
   try {
     this._extVersion = get3PaneWindow().virtualIdentityExtension.extensionVersion;
@@ -932 +932 @@
   //  code adapted from http://xulsolutions.blogspot.com/2006/07/creating-uninstall-script-for.html
   AccountManagerObserver: {
+    self: null,
     _uninstall: false,
     observe: function (subject, topic, data) {
       if (topic == "am-smtpChanges" || topic == "am-acceptChanges") {
         Log.debug("account/smtp changes observed");
-        this.searchIdentityMismatch();
-        this.searchSmtpMismatch();
-        this.refreshAccountInfo();
+        this.self.searchIdentityMismatch();
+        this.self.searchSmtpMismatch();
+        this.self.refreshAccountInfo();
       }
     },
-    register: function () {
+    register: function (self) {
+      this.self = self;
       Log.debug("register AccountManagerObserver");
       var obsService = Components.classes["@mozilla.org/observer-service;1"].