Changeset 5495

Timestamp:

02/10/12 10:16:54 (11 years ago)

Author:

gustavo

Message:

Ticket #2484 - Melhorias na estrutura de diretórios do ExpressoMail?

Location:

trunk

Files:

• expressoMail1_2/js/common_functions.js (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)
• prototype/modules/mail/js/foldertree.js (modified) (5 diffs)

trunk/expressoMail1_2/js/common_functions.js

@@ -907 +907 @@
         } else {
                 Element('new_m').innerHTML = '0';
+                $(folder_unseen).parent().empty();
         }
         if ( current_folder.indexOf( 'INBOX' ) !== 0 )

trunk/expressoMail1_2/js/draw_api.js

@@ -1173 +1173 @@
                         $(tr_element).draggable({
                                 helper: function(event){
-                                        $(this).find("input:checkbox").attr("checked", true);
+                                        if($(this).find("input:checkbox").attr("checked") != "checked"){
+                                                $(this).find("input:checkbox").trigger('click');
+                                                $(this).addClass("selected_msg");
+                                        }
                                         if($("#table_box").find("tr input:checked").length > 1)
                                                 return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"}));

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

@@ -220 +220 @@
                                         DataLayer.render("../prototype/modules/mail/templates/float_folder_menu.ejs", {name_folder : folder_name}, function(html){                                              
                                                 //FUNÇÃO DO MENU FLUTUANTE EDITAR < BEGIN
+                                                var esc = false;
                                                 $(folder_).append(html).find(".float-menu-edit").click(function(){
                                                         var folder_id = $(this).parents(".closed:first").attr('id');
@@ -229 +230 @@
                                                         $(this).parents(".closed:first").find("span:first").empty().append("<input class='new_folder folder' type='text' maxlength='100'></input>")
                                                         $(".new_folder").focus().keydown(function(event){
+                                                                event.stopPropagation();
                                                                 if(event.keyCode == 13){
                                                                         if($(this).val() != ""){
@@ -252 +254 @@
                                                                         }
                                                                 }else if( event.keyCode == 27){
+                                                                        esc = true;
                                                                         if(confirm(get_lang("Do you want to cancel the folder edition?")))
                                                                                 draw_new_tree_folder();
                                                                         else{
                                                                                 $(".new_folder").focus().val(name);
+                                                                                esc = false;
                                                                         }
                                                                 }
                                                         }).focusout(function(){
-                                                                if(confirm(get_lang("Do you want to cancel the folder edition?")))
-                                                                        draw_new_tree_folder();
-                                                                else{
-                                                                        $(".new_folder").focus().val(name);
+                                                                if(!esc){
+                                                                        if(confirm(get_lang("Do you want to cancel the folder edition?")))
+                                                                                draw_new_tree_folder();
+                                                                        else{
+                                                                                $(".new_folder").focus().val(name);
+                                                                        }
                                                                 }
                                                         }).val(name);
@@ -329 +335 @@
                                                         }
                                                         selected_li.find(".new_folder").Watermark("Nova Pasta").focus().keydown(function(event){
+                                                                event.stopPropagation();
                                                                 if(event.keyCode == 13){
                                                                         if($(this).val().match(/[\\\!\@\#\$\%\&\*\+\(\)]/gi)){
@@ -347 +354 @@
                                                                         });
                                                                 }else if( event.keyCode == 27){
+                                                                        esc = true;
                                                                         if(confirm(get_lang("Do you want to cancel the folder creation?")))
-                                                                                cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                                                                draw_new_tree_folder();
+                                                                        else{
+                                                                                $(this).focus();
+                                                                                esc = false;
+                                                                        }
                                                                 }
                                                         }).focusout(function(){
-                                                                if(confirm(get_lang("Do you want to cancel the folder creation?")))
-                                                                        cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);
+                                                                if(!esc){
+                                                                        if(confirm(get_lang("Do you want to cancel the folder creation?")))
+                                                                                draw_new_tree_folder();
+                                                                }
                                                         });
                                                 });