Changeset 6875 for sandbox/2.4.2-expresso2/expressoMail1_2/js

Timestamp:

07/25/12 16:02:01 (12 years ago)

Author:

gustavo

Message:

Ticket #2954 - Corrigidos alguns bugs de anexos e selecao de mensagens

Location:

sandbox/2.4.2-expresso2/expressoMail1_2/js

Files:

• draw_api.js (modified) (4 diffs)
• main.js (modified) (1 diff)
• shortcut.js (modified) (4 diffs)

sandbox/2.4.2-expresso2/expressoMail1_2/js/draw_api.js

@@ -1519 +1519 @@
                                         }
                                         
-                                        if($("#table_box").find("tr input:checked").length > 1 )
+                                        if(totalSelected() > 1 )
                                                 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (totalSelected()+" mensagens selecionadas"), type: "messages"})+"</td></tr>");                             
                                         if(     $(this).find(".td_msg_subject").text().length > 18 )
@@ -1684 +1684 @@
                 
                 $(chk_box_element).click(function(e){
-                                updateSelectedMsgs($(this).is(':checked'),headers_msgs.msg_number);
-                                $(".selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");
-                                if(preferences.use_shortcuts == '1')
-                                        $(this).parents("tr:first").addClass("current_selected_shortcut_msg selected_shortcut_msg");
-                                changeBgColor(e,headers_msgs.msg_number);
+                        updateSelectedMsgs($(this).is(':checked'),headers_msgs.msg_number);
+                        $(".selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");
+                        $(".current_selected_shortcut_msg").removeClass("current_selected_shortcut_msg selected_shortcut_msg");
+                        if(preferences.use_shortcuts == '1')
+                                $(this).parents("tr:first").addClass("current_selected_shortcut_msg selected_shortcut_msg");
+                        changeBgColor(e,headers_msgs.msg_number);
+                        $(this).blur();
                 });
 
@@ -4027 +4029 @@
                 var pthis = $(this);
                 setTimeout(function() {
-                        var str = pthis.val().replace(/[,;\t\n]/gi, ",");
+                        if(pthis.val().split('"') > 1)
+                                var str = pthis.val().replace(/[,;\t]/gi, ","); 
+                        else
+                                var str = pthis.val().replace(/[,;\t\n\s]/gi, ",");
                         str = str.split(",");
                         $.each(str, function(index, value){
@@ -4678 +4683 @@
                 fullFileName : attach_box.find(".att-box-fullfilename").text(),
                 fileSize : attach_box.find(".att-box-filesize").text(),
-                OK : true,
                 error : false
             };

sandbox/2.4.2-expresso2/expressoMail1_2/js/main.js

@@ -683 +683 @@
                                                         });
                                                         }
-                                                        if($("#table_box").find("tr input:checked").length > 1)
+                                                        if(totalSelected() > 1)
                                                                 return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (totalSelected()+" mensagens selecionadas"), type: "messages"})+"</td></tr>");
                                                         if(     $(this).find(".td_msg_subject").text().length > 18 )

sandbox/2.4.2-expresso2/expressoMail1_2/js/shortcut.js

@@ -331 +331 @@
         if($(".current_selected_shortcut_msg").prev().parents("#tbody_box").length)
             $(".current_selected_shortcut_msg").blur().removeClass("current_selected_shortcut_msg").prev().addClass("current_selected_shortcut_msg selected_shortcut_msg");
-        $(".current_selected_shortcut_msg").focus();
+        $(".current_selected_shortcut_msg").addClass("selected_shortcut_msg").focus();
     }
 },{'disable_in_input':true});
@@ -342 +342 @@
         if($(".current_selected_shortcut_msg").next().parents("#tbody_box").length)
             $(".current_selected_shortcut_msg").blur().removeClass("current_selected_shortcut_msg").next().addClass("current_selected_shortcut_msg selected_shortcut_msg");
-        $(".current_selected_shortcut_msg").focus();
+        $(".current_selected_shortcut_msg").addClass("selected_shortcut_msg").focus();
     }
 },{'disable_in_input':true});
@@ -364 +364 @@
             updateSelectedMsgs($(value).find(":checkbox").is(':checked'),$(value).attr("id"));
         });
+        $(".current_selected_shortcut_msg").focus();
     }
 },{'disable_in_input':true});
@@ -470 +471 @@
 },{'disable_in_input':true});
 
-shortcut.add("f5",function(){
+shortcut.add("f9",function(){
     Element("em_refresh_button").onclick();
     return;
-},{'disable_in_input':true});
+},{'disable_in_input':false});
 
 function exec_msg_action(action)