Changeset 8065 for trunk

Timestamp:

04/01/13 11:02:07 (10 years ago)

Author:

douglasz

Message:

Ticket #3407 - Problema ao excluir a mensagem aberta a partir da tecla DEL.

File:

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

trunk/expressoMail1_2/js/main.js

@@ -1354 +1354 @@
                         return false;
                 }
+
                 mail_msg = ( Element("divScrollMain_"+numBox) ) ? Element("divScrollMain_"+numBox).firstChild.firstChild : Element("divScrollMain_0").firstChild.firstChild;
+
+        var showMsg = function(){
+
+            //Se pref. usar mensagens locais ativada e não for operação de arquivamento exibe mensagem de remoção.
+            if(preferences.use_local_messages == 1){
+                if(!expresso_mail_archive.isArchiveOperation){
+                    if (data.msgs_number.length == 1 || typeof(data.msgs_number) == 'string' )
+                        write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name));
+                    else
+                        write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name));
+                }
+            } else {
+                if (data.msgs_number.length == 1 || typeof(data.msgs_number) == 'string' )
+                    write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name));
+                else
+                    write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name));
+            }
+        }
 
                 if (openTab.type[currentTab] > 1)
@@ -1459 +1478 @@
                                 Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) - 1;
                         }
+
+            showMsg();
                         return;
                 }
@@ -1503 +1524 @@
                 }
 
-                //Se pref. usar mensagens locais ativada e não for operação de arquivamento exibe mensagem de remoção.
-                if(preferences.use_local_messages == 1){
-                        if(!expresso_mail_archive.isArchiveOperation){
-                                if (data.msgs_number.length == 1)
-                                        write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name));
-                                else
-                                        write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name));
-                        }
-                } else {
-                        if (data.msgs_number.length == 1)
-                                write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name));
-                        else
-                                write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name));
-                }       
+        showMsg();
 
                 if (data.border_ID.indexOf('r') != -1){