Changeset 6232

Timestamp:

05/18/12 12:26:14 (12 years ago)

Author:

acoutinho

Message:

Ticket #2762 - Apos cancelar pesquisa rapida de mensagens, ha lentidao no acesso a pasta Para Acompanhamento

Location:

trunk/expressoMail1_2/js

Files:

• draw_api.js (modified) (1 diff)
• search.js (modified) (21 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -919 +919 @@
                 }
         }
+         
          //bug do firefox ao redefinir os tamanhos das colunas
-         if (is_mozilla && !is_webkit){  
-           var colgr = document.getElementById("colgroup_main_"+ (parseInt(numBox,10) + 1));
-           if ( (colgr != null) && (colgr != undefined) ){
-             tbM.removeChild(colgr);
-           for (var c=0;c<trM[r].cells.length;c++) {
-                         document.getElementById("colgroup_main_"+numBox).childNodes[c].setAttribute("width",colSizes[tbl][c]);
-          }
-       }
-         }
+        if (is_mozilla && !is_webkit){  
+            if(trM[r])
+            for (var c=0;c<trM[r].cells.length;c++) 
+                document.getElementById("colgroup_main_"+numBox).childNodes[c].setAttribute("width",colSizes[tbl][c]);
+
+        }
 }
 

trunk/expressoMail1_2/js/search.js

@@ +1 @@
+        xhr = false;
+        
         function searchE()
         {
@@ -135 +137 @@
         searchE.prototype.foldersTree = function()
         {
-                var treeFoldersSearch = new dFTree({ name : 'treeFoldersSearch' });
-                
-                var root        = new dNode({ id : 'root', caption: get_lang('My Folders'), onClick: "ttree.setFolder('root')" });
+                var treeFoldersSearch = new dFTree({name : 'treeFoldersSearch'});
+                
+                var root        = new dNode({id : 'root', caption: get_lang('My Folders'), onClick: "ttree.setFolder('root')"});
                 
                 treeFoldersSearch.add(root, 'root');
@@ -143 +145 @@
                 for(var i = 0; i < folders.length ; i++ )
                 {
-                        var nn = new dNode({ id:folders[i].folder_id, caption: lang_folder(folders[i].folder_name), plusSign:folders[i].folder_hasChildren, onClick: "ttree.setFolder('"+folders[i].folder_id+"')"});
+                        var nn = new dNode({id:folders[i].folder_id, caption: lang_folder(folders[i].folder_name), plusSign:folders[i].folder_hasChildren, onClick: "ttree.setFolder('"+folders[i].folder_id+"')"});
                         
                         if ( folders[i].folder_parent == '' )
@@ -153 +155 @@
                 //if ( treeFoldersSearch.getNodeById('user') )
                 {
-                        var n_root_shared_folders = new dNode({ id:'user', caption:get_lang("Shared Folders"), plusSign:true});
+                        var n_root_shared_folders = new dNode({id:'user', caption:get_lang("Shared Folders"), plusSign:true});
                     treeFoldersSearch.add( n_root_shared_folders,'root');
                 }
@@ -842 +844 @@
                                         return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_search_subject").text(), type: "messages"}));
                         },
-                        cursorAt: { cursor: "crosshair", top: -5, left: -5 },
+                        cursorAt: {cursor: "crosshair", top: -5, left: -5},
                         refreshPositions: true ,
                         scroll: true, 
@@ -1040 +1042 @@
                         if( Data['data'] )
                         {
-                                td_element1.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTBOX_REVERSE'); };
+                                td_element1.onclick             = function(){EsearchE.searchFor(border_id, 'SORTBOX_REVERSE');};
                                 td_element1.innerHTML   = "<b>"+get_lang("Folder")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";
                         }
                         else
                         {
-                                td_element1.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTBOX_REVERSE'); };
+                                td_element1.onclick             = function(){EsearchE.searchFor(border_id, 'SORTBOX_REVERSE');};
                                 td_element1.innerHTML   = "<b>"+get_lang("Folder")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";
                         }
@@ -1053 +1055 @@
                         if( Data['data'] )
                         {
-                                td_element1.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTBOX'); };
+                                td_element1.onclick             = function(){EsearchE.searchFor(border_id, 'SORTBOX');};
                         }
                         else
                         {
-                                td_element1.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTBOX'); };
+                                td_element1.onclick             = function(){EsearchE.searchFor(border_id, 'SORTBOX');};
                         }
                         td_element1.innerHTML   = ( sort_type == 'SORTBOX_REVERSE' ) ? arrow_ascendant(get_lang("Folder")) : get_lang("Folder");
@@ -1069 +1071 @@
                         if(Data['data'])
                         {
-                                td_element2.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTFROM_REVERSE'); };
+                                td_element2.onclick             = function(){EsearchE.searchFor(border_id, 'SORTFROM_REVERSE');};
                                 td_element2.innerHTML   = "<b>"+get_lang("From")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";
                         }
                         else
                         {
-                                td_element2.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTWHO_REVERSE'); };
+                                td_element2.onclick             = function(){EsearchE.searchFor(border_id, 'SORTWHO_REVERSE');};
                                 td_element2.innerHTML   = "<b>"+get_lang("From")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";
                         }
@@ -1082 +1084 @@
                         if( Data['data'] )
                         {
-                                td_element2.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTWHO'); };
+                                td_element2.onclick             = function(){EsearchE.searchFor(border_id, 'SORTWHO');};
                         }
                         else
                         {
-                                td_element2.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTWHO'); };
+                                td_element2.onclick             = function(){EsearchE.searchFor(border_id, 'SORTWHO');};
                         }
                         td_element2.innerHTML   = ( sort_type == 'SORTWHO_REVERSE' ) ? arrow_ascendant(get_lang("From")) : get_lang("From");
@@ -1098 +1100 @@
                         if( Data['data'])
                         {
-                                td_element3.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTSUBJECT_REVERSE'); };
+                                td_element3.onclick             = function(){EsearchE.searchFor(border_id, 'SORTSUBJECT_REVERSE');};
                                 td_element3.innerHTML   = "<b>"+get_lang("subject")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";                               
                         }
                         else
                         {
-                                td_element3.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTSUBJECT_REVERSE'); };
+                                td_element3.onclick             = function(){EsearchE.searchFor(border_id, 'SORTSUBJECT_REVERSE');};
                                 td_element3.innerHTML   = "<b>"+get_lang("subject")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";
                         }
@@ -1111 +1113 @@
                         if( Data['data'] )
                         {
-                                td_element3.onclick             = function(){ EsearchE.searchFor( border_id, 'SORTSUBJECT'); };
+                                td_element3.onclick             = function(){EsearchE.searchFor( border_id, 'SORTSUBJECT');};
                         }
                         else
                         {
-                                td_element3.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTSUBJECT'); };
+                                td_element3.onclick             = function(){EsearchE.searchFor(border_id, 'SORTSUBJECT');};
                         }
                         td_element3.innerHTML   = ( sort_type == 'SORTSUBJECT_REVERSE' ) ? arrow_ascendant(get_lang("subject")) : get_lang("subject");
@@ -1127 +1129 @@
                         if( Data['data'] )
                         {
-                                td_element4.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTDATE_REVERSE'); };
+                                td_element4.onclick             = function(){EsearchE.searchFor(border_id, 'SORTDATE_REVERSE');};
                                 td_element4.innerHTML   = "<b>"+get_lang("Date")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";
                         }
                         else
                         {
-                                td_element4.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTDATE_REVERSE'); };
+                                td_element4.onclick             = function(){EsearchE.searchFor(border_id, 'SORTDATE_REVERSE');};
                                 td_element4.innerHTML   = "<b>"+get_lang("Date")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";
                         }
@@ -1140 +1142 @@
                         if( Data['data'] )
                         {
-                                td_element4.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTDATE'); };
+                                td_element4.onclick             = function(){EsearchE.searchFor(border_id, 'SORTDATE');};
                         }
                         else
                         {
-                                td_element4.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTDATE'); };
+                                td_element4.onclick             = function(){EsearchE.searchFor(border_id, 'SORTDATE');};
                         }
                         td_element4.innerHTML   = ( sort_type == 'SORTDATE_REVERSE' ) ? arrow_ascendant(get_lang("Date")) : get_lang("Date");
@@ -1156 +1158 @@
                         if( Data['data'] )
                         {
-                                td_element5.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTSIZE_REVERSE'); };
+                                td_element5.onclick             = function(){EsearchE.searchFor(border_id, 'SORTSIZE_REVERSE');};
                                 td_element5.innerHTML   = "<b>"+get_lang("size")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";                          
                         }
                         else
                         {
-                                td_element5.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTSIZE_REVERSE'); };
+                                td_element5.onclick             = function(){EsearchE.searchFor(border_id, 'SORTSIZE_REVERSE');};
                                 td_element5.innerHTML   = "<b>"+get_lang("size")+"</b><img src='templates/"+template+"/images/arrow_descendant.gif'>";
                         }
@@ -1169 +1171 @@
                         if( Data['data'] )
                         {       
-                                td_element5.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTSIZE'); };
+                                td_element5.onclick             = function(){EsearchE.searchFor(border_id, 'SORTSIZE');};
                         }
                         else
                         {
-                                td_element5.onclick             = function(){ EsearchE.searchFor(border_id, 'SORTSIZE'); };
+                                td_element5.onclick             = function(){EsearchE.searchFor(border_id, 'SORTSIZE');};
                         }
                         td_element5.innerHTML   = ( sort_type == 'SORTSIZE_REVERSE' ) ? arrow_ascendant(get_lang("size")) : get_lang("size");
@@ -1207 +1209 @@
                                         var _div_gears = document.createElement("div");
                                         _div_gears.id = "local-messages-search-warning_"+border_id;
-                                        _div_gears.onclick = function(){ EsearchE.viewLocalMessage(); };
+                                        _div_gears.onclick = function(){EsearchE.viewLocalMessage();};
                                         _div_gears.className = 'local-messages-search-warning';
                                         _div_gears.innerHTML = get_lang("The search has% 1 messages stored locally. Want to see them ? Click here.", Data['gears_num_msgs']);
@@ -1628 +1630 @@
         }
         
+        searchE.prototype.quickSearchAbort = function(){
+            xhr.abort();
+        }
+        
+        /*
+         * Removido o cExecute e trocado pelo $.ajax do jquery que melhor implementa os controles ajax de requisições
+         * possibilitando o cancelamento real da requisição e liberando usabilidade das demais funcionalidades do módulo 
+         **/
         searchE.prototype.quickSearchMail = function(value, page, sort, border_id)
         {
@@ -1633 +1643 @@
                 var temp;
                 var not_found_corrent_folder = true;
-
                 this.all_mailboxes();
                 var nm_box = new Array;
@@ -1659 +1668 @@
 
                 var args                = "$this.imap_functions.quickSearchMail";
-                var params              = { page: this.page, sort: this.sort, search: this.value };
+                var params              = {page: this.page, sort: this.sort, search: this.value};
 
                 var selection1 = [], selection2 = [];
@@ -1693 +1702 @@
                                         labels[2] = "mensagens nas suas pastas compartilhadas";
                                 }
-                            var link = ' <a href="#" onclick="connector.cancelRequest(); clean_msg(); return false;">cancelar<a/>';
-
+                            var link = ' <a href="#" onclick="searchE.prototype.quickSearchAbort(); clean_msg(); return false;">cancelar<a/>';
                             write_msg( "pesquisando " + labels[0] + link, true );
+                            var keepFilled = false;
                             
-                            var keepFilled = false;
 
                             var handler = function( data )
                             {
-                                        data = $.parseJSON( Base64.decode(data) );
+                                        data = $.parseJSON( Base64.decode( connector.unserialize(data)) );
+                                        //data = $.parseJSON( Base64.decode( data) );
             
                                         var allMsg      = {
@@ -1732 +1741 @@
 
                                         EsearchE.mount_result( allMsg, EsearchE.sort, ( keepFilled || border_id === currentTab ), keepFilled, "Foram encontradas " + data['msgs'].length + " "+labels.shift()+"." );
+                                        write_msg( "pesquisando " + labels[0] + link, true );
+                                        keepFilled = true;
+                                        if( url.length ){
+                                            xhr = $.ajax({
+                                                url: 'controller.php?action='+url.shift(),
+                                                async: true,
+                                                success: function(data){handler(data);}
+                                            });
+                                        }else{
+                                            xhr = false;
+                                            clean_msg();
+                                        }
                                         
-                                        keepFilled = true;
-                                        
-                                        write_msg( "pesquisando " + labels[0] + link, true );
-
-                                        if( url.length )
-                                                cExecute( url.shift(), handler );
-                                        else
-                                                clean_msg();
                             }
-
-                            cExecute( url.shift(), handler );
+                            
+                            xhr = $.ajax({
+                                url: 'controller.php?action='+url.shift(),
+                                async: true,
+                                success: function(data){handler(data);}
+                            });
                     }
         }