Changeset 7657 for trunk/expressoMail1_2/js/main.js

Timestamp:

12/14/12 17:37:05 (11 years ago)

Author:

antonio

Message:

Ticket #3226 - Corrigido problema ao clicar em 'Encaminhar' após ter clicado em 'Responder'

File:

• trunk/expressoMail1_2/js/main.js (modified) (2 diffs)

trunk/expressoMail1_2/js/main.js

@@ -2112 +2112 @@
 function new_message(type, border_ID, flagged)
 {
-    // if there's a reply already open, just switch to it
-    reply_tab_id = border_ID.replace('_r', '');
-    if (openTab.type[reply_tab_id] == tabTypes[type])
+    action_tab_id = border_ID.replace('_r', '');
+    if (openTab.type[action_tab_id])
     {
-        alternate_border(reply_tab_id);
-        resizeWindow();
-        return;
-    }
-
-    if (RichTextEditor.editorReady === false) return false;
-
-    RichTextEditor.editorReady = false;
-
-
-    if (Element('show_img_link_' + border_ID))
-    {
-        show_msg_img(border_ID.match(/^\d*/)[0], Element('input_folder_' + border_ID).value);
-    }
-    var new_border_ID = draw_new_message((type == 'new') ? parseInt(border_ID.replace('_r','')) : border_ID.replace('_r',''));
-
-    if (typeof (openTab.type[new_border_ID]) != "undefined")
-    {
-        if (tabTypes[type] == openTab.type[new_border_ID])
+        // if there's a reply already open, just switch to it
+        if (openTab.type[action_tab_id] == tabTypes[type])
         {
-            if (type != 'edit')
-            {
-                delete_border(currentTab);
-                new_border_ID = draw_new_message(border_ID);
-            }
+            alternate_border(action_tab_id);
+            resizeWindow();
+            return action_tab_id;
         }
         else
         {
+            // if not, ask the user:
             var a_types = {
                 6: get_lang("Forward"),
@@ -2151 +2132 @@
                 10: get_lang("Reply to all without history")
             };
-            if (new_border_ID != 0) if (!confirm(get_lang("Your message to %1 has not been saved or sent. " +
-                "To %2 will be necessary open it again. Discard your message?",
-            a_types[openTab.type[new_border_ID]].toUpperCase(),
-            a_types[tabTypes[type]].toUpperCase())))
-            {
-                return new_border_ID;
-            }
-            else
+            var response = confirm(
+                get_lang(
+                    "Your message to %1 has not been saved or sent. " +
+                    "To %2 will be necessary open it again. Discard your message?",
+                    a_types[openTab.type[action_tab_id]].toUpperCase(),
+                    a_types[tabTypes[type]].toUpperCase()
+                )
+           );
+           if (response)
+           {
+               alternate_border(action_tab_id);
+               resizeWindow();
+               delete_border(currentTab);
+           }
+           else
+           {
+               return action_tab_id;
+           }
+        }
+    }
+
+    if (RichTextEditor.editorReady === false) return false;
+
+    RichTextEditor.editorReady = false;
+
+
+    if (Element('show_img_link_' + border_ID))
+    {
+        show_msg_img(border_ID.match(/^\d*/)[0], Element('input_folder_' + border_ID).value);
+    }
+    var new_border_ID = draw_new_message((type == 'new') ? parseInt(border_ID.replace('_r','')) : border_ID.replace('_r',''));
+
+    // Does this block has any purpose at all?
+    if (typeof (openTab.type[new_border_ID]) != "undefined")
+    {
+        if (tabTypes[type] == openTab.type[new_border_ID])
+        {
+            if (type != 'edit')
             {
                 delete_border(currentTab);