Changeset 6754 for branches/2.4/expressoMail1_2/js/search.js

Timestamp:

07/11/12 11:45:10 (12 years ago)

Author:

niltonneto

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.1.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoMail1_2/js/search.js (modified) (8 diffs)

branches/2.4/expressoMail1_2/js/search.js

@@ -20 +20 @@
         
         //Monta os forms dentro da janela;
-        searchE.prototype.showForms = function(value)
+        searchE.prototype.showForms = function(value, data)
         {
                 if( trim(value) != "" )
@@ -39 +39 @@
                         var div         = document.createElement("div");
                         var args        = null;
-        
+                        
                         args = 
                         {
@@ -63 +63 @@
                                 "Old"                                           : get_lang('Old'),
                                 "Search_the_messages_in_these_folders" : get_lang('Search the messages in these folders'),
-                                "In_all_the_folders"            : get_lang('In all the folders')
-                        }
-                        
+                                "In_all_the_folders"            : get_lang('In all the folders'),
+                                "From_value" : (data != "undefined" ? data : "")
+                        }
+                                
                         $(div).html(DataLayer.render("./templates/default/searchMails.ejs", args ));
                         div.setAttribute( "style","overflow:hidden");
@@ -515 +516 @@
                                 td.id = "td_message_answered_"+uid_msg;
                                 if (aux.flag.match('X'))
-                                        td1 = '<img src=templates/'+template+'/images/forwarded.gif title="'+get_lang('Forwarded')+'">';
+                                        td1 = '<img src=templates/'+template+'/images/forwarded.png title="'+get_lang('Forwarded')+'">';
                                 else
                                         if (aux.flag.match('A'))
-                                                td1 = '<img src=templates/'+template+'/images/answered.gif title="'+get_lang('Answered')+'">';
+                                                td1 = '<img src=templates/'+template+'/images/answered.png title="'+get_lang('Answered')+'">';
                                         else
                                                 td1 = '';
@@ -585 +586 @@
                                                         
                                                         if (fail) {
-                                                            var isCurrentFolder = current_folder == mailbox ? '#td_message_followup_' + messageClickedId + ', ' : '';    
-                                                            $(isCurrentFolder + 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "#CCCCCC"); 
-                                                            MsgsCallbackFollowupflag[fail](); 
-                                                            return false;
+                                                            
+                                                            var isCurrentFolder = current_folder == mailbox ? '#td_message_followup_' + messageClickedId + ', ' : '';   
+                                                            $(isCurrentFolder + 'tr[role="'+messageClickedId+'_'+mailbox+'"] #td_message_followup_search_' + messageClickedId).find(".flag-edited").css("background", "#CCCCCC");
+                                                            MsgsCallbackFollowupflag[fail]();
+                                                            return false;
                                                         }
                                                         
@@ -846 +848 @@
                         scrollSpeed: 100,
                         containment: "#divAppbox"
-                }).bind("contextmenu", function(event){ 
+                }).bind("contextmenu", function(event){
                         if(event.button == 2)
                                 if($(this).find("input:checkbox").attr("checked") != "checked"){
@@ -1741 +1743 @@
                                         if( url.length ){
                                             xhr = $.ajax({
-                                                url: 'controller.php?action='+url.shift(), 
-                                                async: true, 
-                                                success: function(data){ 
-                                                        handler(data); 
-                                                }, 
-                                                beforeSend: function( jqXHR, settings ){ 
-                                                        connector.showProgressBar(); 
-                                                }, 
-                                                  complete: function( jqXHR, settings ){ 
-                                                        connector.hideProgressBar(); 
-                                                } 
-                                            });
+                                                        url: 'controller.php?action='+url.shift(),
+                                                        async: true,
+                                                        success: function(data){
+                                                                handler(data);
+                                                        },
+                                                        beforeSend: function( jqXHR, settings ){
+                                                                connector.showProgressBar();
+                                                        },
+                                                          complete: function( jqXHR, settings ){
+                                                                connector.hideProgressBar();
+                                                        }
+                                                });
                                         }else{
                                             xhr = false;
@@ -1763 +1765 @@
                                 url: 'controller.php?action='+url.shift(),
                                 async: true,
-                                success: function(data){handler(data);}, 
-                                beforeSend: function( jqXHR, settings ){ 
-                                        connector.showProgressBar(); 
-                                }, 
-                                  complete: function( jqXHR, settings ){ 
-                                        connector.hideProgressBar(); 
-                                } 
+                                success: function(data){handler(data);},
+                                beforeSend: function( jqXHR, settings ){
+                                        connector.showProgressBar();
+                                },
+                                  complete: function( jqXHR, settings ){
+                                        connector.hideProgressBar();
+                                }
                             });
                     }