Changeset fdd549 for content/v_identity.js

Timestamp:

Oct 15, 2014, 11:01:03 PM (8 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

998c9e

Parents:

162a67

Message:

second init-stage was called twice on window reopening, fixed

File:

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

content/v_identity.js

@@ -34 +34 @@
 
 var main = {
+    _window_first_use : true,
+    
     headerParser : Components.classes["@mozilla.org/messenger/headerparser;1"]
                 .getService(Components.interfaces.nsIMsgHeaderParser),
@@ -68 +70 @@
         NotifyComposeBodyReady: function() { 
             Log.debug("NotifyComposeBodyReady");
-            main.initSystemStage2();
+            // only call initSystemStage2 if window is not reopened
+            if (main._window_first_use) {
+                main._window_first_use = false;
+                main.initSystemStage2();
+            }
         },
         NotifyComposeFieldsReady: function() { 
@@ -301 +307 @@
         vI.vIprefs.dropLocalChanges();
 
-        // stateListener sometimes does not work at all - just trying to call stage2 directly
-//      // stateListener only works in reply-cases
-//      // so activate stage2 in reply-cases trough StateListener
-//      // in other cases directly
-//         // (but StateListener is required for Cleanup, so register)
-//      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:
-//              gMsgCompose.RegisterStateListener(main.ComposeStateListener);
-//      }
         main.initSystemStage2();
         Log.debug("reopen done.")