Changeset 5219
- Timestamp:
- 11/30/11 09:44:52 (12 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/abas.js
r5213 r5219 146 146 } 147 147 148 function create_border(borderTitle, id_value )148 function create_border(borderTitle, id_value, search) 149 149 { 150 150 … … 240 240 if ( resize ) 241 241 borderTitle = borderTitle.substring(0, resize*0.08); 242 var cc = document.getElementById("em_message_search"); 242 243 var cc = search; 244 if(!cc){ 245 var is_local = ID.match('.*_local_.*'); 246 if(!is_local) 247 cc = document.getElementById("em_message_search").value; 248 else{ 249 cc = document.getElementsByName(currentTab)[0].value; 250 } 251 } 243 252 244 253 td.innerHTML = "<div style='width:100%;border:0;padding:0;'>\n\ … … 249 258 <img onmousedown='javascript:return false' style='cursor:pointer' onclick=delete_border('" + ID + "','false') src='templates/"+template+"/images/close_button.gif'/>\n\ " + 250 259 "</div>\n\ " + 251 "<input type=\"hidden\" name=\""+ ID+"\" value=\""+cc .value+"\">" +260 "<input type=\"hidden\" name=\""+ ID+"\" value=\""+cc+"\">" + 252 261 "</div>"; 253 262 -
trunk/expressoMail1_2/js/search.js
r5215 r5219 368 368 var border_id = borderID; 369 369 var sort_type = sortType; 370 371 if( this.value ) 372 return this.quickSearchMail( false, false, sortType, border_id ); 370 var is_local = border_id.match('.*_local_.*'); 371 if(!is_local) 372 if( this.value ) 373 return this.quickSearchMail( document.getElementsByName(currentTab)[0].value, false, sortType, border_id ); 373 374 374 var is_local = border_id.match('.*_local_.*');375 376 375 var args = "$this.imap_functions.search_msg"; 377 376 var params = "condition="+EsearchE.condition+"&page="+EsearchE.page+"&sort_type="+sort_type; … … 399 398 } 400 399 } 401 402 if( data['num_msgs']) 400 if (!is_local) 403 401 { 404 allMsg['data'] = data['data']; 405 allMsg['num_msgs'] = data['num_msgs']; 406 407 } 402 if( data['num_msgs']) 403 { 404 allMsg['data'] = data['data']; 405 allMsg['num_msgs'] = data['num_msgs']; 406 407 } 408 } 408 409 409 410 if (gears.length > 0) … … 412 413 } 413 414 415 var currentSearch = document.getElementsByName(currentTab)[0].value; 416 414 417 delete_border( border_id, false ); 415 418 416 EsearchE.mount_result( allMsg , sort_type );419 EsearchE.mount_result( allMsg , sort_type, null, null, null, currentSearch ); 417 420 }; 418 421 … … 648 651 649 652 // Form resultado 650 searchE.prototype.mount_result = function( Data, sort_type, keep_border, keep_filled, division )653 searchE.prototype.mount_result = function( Data, sort_type, keep_border, keep_filled, division, actualSearch ) 651 654 { 652 655 var data = ( Data['data'] ) ? Data['data'] : Data['data_gears']; … … 674 677 } 675 678 if( Data['data'] ) 676 var border_id = create_border(get_lang("Server Results"), "search_" + numBox); 677 679 if(!actualSearch) 680 var border_id = create_border(get_lang("Server Results"), "search_" + numBox); 681 else 682 var border_id = create_border(get_lang("Server Results"), "search_" + numBox, actualSearch); 678 683 if( Data['data_gears']) 679 var border_id = create_border(get_lang("Local Results"), "search_local_msg" + numBox); 684 if(!actualSearch) 685 var border_id = create_border(get_lang("Local Results"), "search_local_msg" + numBox); 686 else 687 var border_id = create_border(get_lang("Local Results"), "search_local_msg" + numBox, actualSearch); 680 688 } 681 689 … … 966 974 if( parseInt( Data['gears_num_msgs'] ) > 0 && !keep_filled) 967 975 { 968 var _div_gears = document.createElement("div"); 969 _div_gears.onclick = function(){ EsearchE.viewLocalMessage(); }; 970 _div_gears.className = 'local-messages-search-warning'; 971 _div_gears.innerHTML = get_lang("The search has% 1 messages stored locally. Want to see them ? Click here.", Data['gears_num_msgs']); 972 973 content_search.appendChild(_div_gears); 976 var messagesWarning = document.getElementById("local-messages-search-warning_"+border_id); 977 if(!messagesWarning){ 978 var _div_gears = document.createElement("div"); 979 _div_gears.id = "local-messages-search-warning_"+border_id; 980 _div_gears.onclick = function(){ EsearchE.viewLocalMessage(); }; 981 _div_gears.className = 'local-messages-search-warning'; 982 _div_gears.innerHTML = get_lang("The search has% 1 messages stored locally. Want to see them ? Click here.", Data['gears_num_msgs']); 983 content_search.appendChild(_div_gears); 984 } 974 985 } 975 986 … … 1355 1366 this.page = isNaN(page) ? ( value ? 0 : this.page ) : page; 1356 1367 this.value = value || this.value || false; 1357 1368 1358 1369 if( !this.value ) 1359 1370 return alert( "Busca sem caracteres." );
Note: See TracChangeset
for help on using the changeset viewer.