Changeset 8111 for trunk/prototype

Timestamp:

04/24/13 15:25:49 (11 years ago)

Author:

thiago

Message:

Ticket #3436 - Algumas correções adicionais (archiver) para esse ticket

File:

• trunk/prototype/modules/mail/js/foldertree.js (modified) (2 diffs)

trunk/prototype/modules/mail/js/foldertree.js

@@ -406 +406 @@
             $(this).removeClass("folder-over");
 
-            if($(ui.draggable[0]).parent().find("input").val() == "localFolder" && $(this).parents("li").find("input").first().val() != "localFolder")
-            {
-                return write_msg(get_lang("Ohh no, it isn't possible to send a folder by Archiver to My folders"));
-            }
-            else if(!$(ui.draggable[0]).parent().find("input").val() && $(this).parents("li").find("input").first().val() == "localFolder")
-            {
-                return write_msg(get_lang("Ohh no, it isn't possible to send a folder by My folders to Archiver"));
-            }
-
             if($(this).parent().attr('id') == undefined)
             {
-
                 var folder_to = 'INBOX';
                 var to_folder_title = get_lang("Inbox");
@@ -460 +450 @@
             else
             {
+                if($(ui.draggable[0]).parent().find("input").val() == "localFolder" && $(this).parents("li").find("input").first().val() != "localFolder")
+                {
+                    return write_msg(get_lang("It isn't possible to send a folder by Archiver to My folders"));
+                }
+                else if(!$(ui.draggable[0]).parent().find("input").val() && $(this).parents("li").find("input").first().val() == "localFolder")
+                {
+                    return write_msg(get_lang("It isn't possible to send a folder by My folders to Archiver"));
+                }
                 var folder_to_exist = folder_to_move.split(cyrus_delimiter);
                 folder_to_exist = folder_to + cyrus_delimiter + folder_to_exist[folder_to_exist.length - 1];