Changeset 61e3f4

Timestamp:

Sep 10, 2018, 5:40:16 PM (4 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

6a4b56

Parents:

e4b836

Message:

compose-window is not recycled anymore

File:

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

content/v_identity.js

@@ -84 +84 @@
         ComposeProcessDone: function (aResult) {
           Log.debug("StateListener reports ComposeProcessDone");
-          vI.vIaccount_removeUsedVIAccount();
           vI.storage.clean();
         },
         SaveInFolderDone: function (folderURI) {
           Log.debug("SaveInFolderDone");
-          vI.vIaccount_removeUsedVIAccount();
           vI.storage.clean();
         }
@@ -167 +165 @@
       },
 
-      remove: function () {
-        window.removeEventListener('compose-window-reopen', main.reopen, true);
-        window.removeEventListener('compose-window-close', main.close, true);
-        Log.debug("end. remove Account if there.")
-        vI.storage.clean();
-      },
-
       _getRecipients: function () {
         var recipients = [];
@@ -216 +207 @@
         window.removeEventListener('load', main.init, false);
         window.removeEventListener('compose-window-init', main.init, true);
-        if (main.elements.Area_MsgIdentityHbox) return; // init done before, (?reopen)
+
         Log.debug("init.")
         main.unicodeConverter.charset = "UTF-8";
@@ -231 +222 @@
         document.getElementById("virtualIdentityExtension_tooltipPopupset")
           .addTooltip(document.getElementById("msgIdentity"), false);
-        window.addEventListener('compose-window-reopen', main.reopen, true);
-        window.addEventListener('compose-window-close', main.close, true);
 
         main.AccountManagerObserver.register();
@@ -248 +237 @@
       },
 
-      close: function () {
-        vI.storage.clean();
-      },
-
       adapt_loadIdentity: function () {
         if (main.original_functions.LoadIdentity) return true; // only initialize this once
@@ -266 +251 @@
         GenericSendMessage = main.replacement_functions.GenericSendMessage;
         return true;
-      },
-
-      reopen: function () {
-        vI.clearDebugOutput();
-        Log.debug("composeDialog reopened. (msgType " + gMsgCompose.type + ")")
-        Log.debug("document.title=" + document.title + " gMsgCompose=" + gMsgCompose + " msgIdentityMenu=" + document.getElementById("msgIdentity"))
-
-        // clean all elements
-        document.getElementById("msgIdentity").clean();
-        vI.storage.clean(); // just to be sure!
-        Log.debug("everything cleaned.")
-
-        // register StateListener
-        gMsgCompose.RegisterStateListener(main.ComposeStateListener);
-
-        // now (re)init the elements
-        main.initSystemStage1();
-
-        vI.vIprefs.dropLocalChanges();
-
-        // NotifyComposeBodyReady is only triggered in reply-cases
-        // so activate stage2 in reply-cases trough StateListener
-        // in other cases directly
-        var msgComposeType = Components.interfaces.nsIMsgCompType;
-        switch (gMsgCompose.type) {
-        case msgComposeType.New:
-        case msgComposeType.NewsPost:
-        case msgComposeType.MailToUrl:
-        case msgComposeType.Draft:
-        case msgComposeType.Template:
-        case msgComposeType.ForwardAsAttachment:
-        case msgComposeType.ForwardInline:
-          main.initSystemStage2();
-          //             case msgComposeType.Reply:
-          //             case msgComposeType.ReplyAll:
-          //             case msgComposeType.ReplyToGroup:
-          //             case msgComposeType.ReplyToSender:
-          //             case msgComposeType.ReplyToSenderAndGroup:
-          //             case msgComposeType.ReplyWithTemplate:
-          //             case msgComposeType.ReplyToList:
-          //                 main.initSystemStage2() triggered trough NotifyComposeBodyReady;
-        }
-        Log.debug("reopen done.")
       },