Changeset c6cf17

Timestamp:

Oct 17, 2014, 4:06:27 PM (8 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

45ce33

Parents:

13df6d

Message:

in reply-cases we have to wait till we get NotifyComposeBodyReady? before reading the recipients

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),
@@ -70 +68 @@
         NotifyComposeBodyReady: function() { 
             Log.debug("NotifyComposeBodyReady");
-            // only call initSystemStage2 if window is not reopened
-            if (main._window_first_use) {
-                main._window_first_use = false;
-                main.initSystemStage2();
-            }
+            main.initSystemStage2();
         },
         NotifyComposeFieldsReady: function() { 
@@ -307 +301 @@
         vI.vIprefs.dropLocalChanges();
 
-        main.initSystemStage2();
+        // 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.")
     },