Changeset 8117 for branches/2.5/prototype/modules/mail/js/foldertree.js

Timestamp:

04/25/13 09:24:59 (11 years ago)

Author:

douglas

Message:

Ticket #3436 - Nao fechamento de aba de visualizacao de mensagem apos seu arquivamento

File:

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

branches/2.5/prototype/modules/mail/js/foldertree.js

@@ -322 +322 @@
             $(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");
@@ -365 +358 @@
             // SE O DROP VIER DA LISTA DE PASTAS
             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];