Changeset 3682 for branches/2.2
- Timestamp:
- 01/12/11 15:50:28 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/expressoMail1_2/js/search.js
r3659 r3682 225 225 return data2 - data1; 226 226 } 227 227 228 function date_comp_reverse(a,b) 228 229 { … … 232 233 function box_comp(a,b) 233 234 { 234 var compare = []; 235 compare[0] = a.substr(0, a.indexOf('--')); 236 compare[0] = compare[0].toLowerCase(); 237 var temp=compare[0]; 238 compare[1] = b.substr(0, b.indexOf('--')) 239 compare[1] = compare[1].toLowerCase(); 240 compare.sort(); 241 if (temp != compare[0]) 242 return +1; 243 else 244 return -1; 245 } 235 var compare = []; 236 compare[0] = a.substr(0, a.indexOf('--')); 237 compare[0] = compare[0].toLowerCase(); 238 239 var temp=compare[0]; 240 compare[1] = b.substr(0, b.indexOf('--')) 241 compare[1] = compare[1].toLowerCase(); 242 243 compare.sort(); 244 245 if (temp != compare[0]) 246 return +1; 247 else 248 return -1; 249 } 250 246 251 function box_comp_reverse(a,b) 247 252 { … … 251 256 function who_comp(a,b) 252 257 { 253 var compare = []; 254 compare[0] = a.substr(a.indexOf('--')+2); 255 compare[0] = compare[0].toLowerCase(); 256 var temp=compare[0]; 257 compare[1] = b.substr(b.indexOf('--')+2); 258 compare[1] = compare[1].toLowerCase(); 259 compare.sort(); 260 if (temp != compare[0]) 261 return +1; 262 else 263 return -1; 264 } 258 var compare = []; 259 compare[0] = a.substr(a.indexOf('--')+2); 260 compare[0] = compare[0].substr(compare[0].indexOf('--')+2); 261 compare[0] = compare[0].toLowerCase(); 262 263 var temp = compare[0]; 264 compare[1] = b.substr(b.indexOf('--')+2); 265 compare[1] = compare[1].substr(compare[1].indexOf('--')+2); 266 compare[1] = compare[1].toLowerCase(); 267 268 compare.sort(); 269 270 if (temp != compare[0]) 271 return +1; 272 else 273 return -1; 274 } 275 265 276 function who_comp_reverse(a,b) 266 277 { … … 270 281 function subject_comp(a,b) 271 282 { 272 var compare = []; 273 compare[0] = a.substr(a.indexOf('--')+2); 274 compare[0] = compare[0].substr(compare[0].indexOf('--')+2); 275 compare[0] = compare[0].toLowerCase(); 276 var temp=compare[0]; 277 compare[1] = b.substr(b.indexOf('--')+2); 278 compare[1] = compare[1].substr(compare[1].indexOf('--')+2); 279 compare[1] = compare[1].toLowerCase(); 280 compare.sort(); 281 if (temp != compare[0]) 282 return +1; 283 else 284 return -1; 285 } 283 var compare = []; 284 compare[0] = a.substr(a.indexOf('--')+2); 285 compare[0] = compare[0].substr(compare[0].indexOf('--')+2); 286 compare[0] = compare[0].substr(compare[0].indexOf('--')+2); 287 compare[0] = compare[0].toLowerCase(); 288 var temp=compare[0]; 289 compare[1] = b.substr(b.indexOf('--')+2); 290 compare[1] = compare[1].substr(compare[1].indexOf('--')+2); 291 compare[1] = compare[1].substr(compare[1].indexOf('--')+2); 292 compare[1] = compare[1].toLowerCase(); 293 294 compare.sort(); 295 296 if (temp != compare[0]) 297 return +1; 298 else 299 return -1; 300 } 301 286 302 function subject_comp_reverse(a,b) 287 303 { … … 292 308 { 293 309 var data1 = a.match(/\d{2}\/\d{2}\/\d{4}--\d+? \w*b--.*--\d*$/g); 294 data1 = data1[0].substr(data1[0].indexOf('--')+2)295 data1 = data1.substr(0,data1.indexOf('--'))310 data1 = data1[0].substr(data1[0].indexOf('--')+2) 311 data1 = data1.substr(0,data1.indexOf('--')) 296 312 var size_a = parseInt(data1.substr(0,data1.indexOf(' '))); 313 297 314 if (data1.match("k")) 298 315 size_a = size_a * 1024; … … 300 317 if (data1.match("m")) 301 318 size_a = size_a * 1048576; 319 302 320 var data2 = b.match(/\d{2}\/\d{2}\/\d{4}--\d+? \w*b--.*--\d*$/g); 303 data2 = data2[0].substr(data2[0].indexOf('--')+2)304 data2 = data2.substr(0,data2.indexOf('--'))321 data2 = data2[0].substr(data2[0].indexOf('--')+2) 322 data2 = data2.substr(0,data2.indexOf('--')) 305 323 var size_b = parseInt(data2.substr(0,data2.indexOf(' '))); 324 306 325 if (data2.match("k")) 307 326 size_b = size_b * 1024; … … 311 330 return size_b - size_a; 312 331 } 332 313 333 function size_comp_reverse(a,b) 314 334 { … … 317 337 318 338 // Form resultado 319 searchE.prototype.mount_result = function(data,sort_type){ 339 searchE.prototype.mount_result = function( data, sort_type) 340 { 320 341 var nw_array = new Array; 321 342 var var_tmp = data.substr(2, data.length - 4); 322 var_tmp = var_tmp.split("####"); 343 var_tmp = var_tmp.split("####"); 344 323 345 var cont = parseInt(0); 346 324 347 switch (sort_type) 325 348 { … … 334 357 break; 335 358 case 'SORTBOX_REVERSE': 336 337 359 var_tmp.sort(box_comp_reverse); 360 break; 338 361 case 'SORTSUBJECT': 339 362 var_tmp.sort(subject_comp); … … 346 369 break; 347 370 case 'SORTWHO_REVERSE': 348 371 var_tmp.sort(who_comp_reverse); 349 372 break; 350 373 case 'SORTSIZE': … … 358 381 } 359 382 360 for(var i=0; i < var_tmp.length; i++){ 383 for(var i=0; i < var_tmp.length; i++) 384 { 361 385 if(var_tmp[i] != "") 362 386 { … … 366 390 } 367 391 368 if( (preferences.search_result_number != '65536') && (nw_array.length > 0) && (nw_array.length >= preferences.search_result_number) ){ 369 nw_array.length = preferences.search_result_number; 370 write_msg(get_lang("More than %1 results. Please, try to refine your search.",preferences.search_result_number)); 371 } 372 else { 373 write_msg(nw_array.length + " "+ get_lang('results found')); 374 } 392 if( ( preferences.search_result_number != '65536') && (nw_array.length > 0) && (nw_array.length >= preferences.search_result_number) ) 393 { 394 nw_array.length = preferences.search_result_number; 395 write_msg(get_lang("More than %1 results. Please, try to refine your search.",preferences.search_result_number)); 396 } 397 else 398 { 399 write_msg(nw_array.length + " "+ get_lang('results found')); 400 } 375 401 376 402 numBox++; 403 377 404 var border_id = create_border(get_lang("Search Results"), "search_" + numBox); 378 if (!border_id) 379 { 380 return; 381 } 382 currentTab = border_id; 383 openTab.content_id[currentTab] = Element('content_id_search_' + numBox); 384 openTab.type[currentTab] = 1; 405 406 if (!border_id) 407 { 408 return; 409 } 410 411 currentTab = border_id; 412 openTab.content_id[currentTab] = Element('content_id_search_' + numBox); 413 openTab.type[currentTab] = 1; 385 414 var table = document.createElement("TABLE"); 386 415 table.id = "table_resultsearch_" + numBox; … … 391 420 table.className = "table_box"; 392 421 393 var tbody = document.createElement("TBODY"); 394 tbody.id = "tbody_box_" + numBox; 395 396 for( var i=0; i < nw_array.length; i++){ 422 var tbody = document.createElement("TBODY"); 423 tbody.id = "tbody_box_" + numBox; 424 425 for( var i = 0; i < nw_array.length; i++) 426 { 397 427 var tr = document.createElement("TR"); 398 tr.style.height = preferences.line_height;428 tr.style.height = preferences.line_height; 399 429 400 430 if (false && nw_array[i].match(/.*--.*--\w*--\d{2}\/\d{2}\/\d{4}--\d+? \w*b--.*--\d*$/g) != null) //subject with "--" 401 431 { 402 432 var aux1 = nw_array[i].match(/\d{2}\/\d{2}\/\d{4}--\d+? \w*b--.*--\d*$/g); 403 aux1 = aux1[0].split("--");433 aux1 = aux1[0].split("--"); 404 434 nw_array[i] = nw_array[i].substr(0, nw_array[i].indexOf(aux1[0])-2); 405 var aux = []; 406 aux[0] = nw_array[i].substr(0, nw_array[i].indexOf('--')); 435 436 var aux = []; 437 438 aux[0] = nw_array[i].substr(0, nw_array[i].indexOf('--')); 407 439 nw_array[i] = nw_array[i].substr(nw_array[i].indexOf('--')+2); 408 440 aux[3] = nw_array[i].substr(0, nw_array[i].indexOf('--')); … … 494 526 td.style.color = "#42795b"; 495 527 td.style.fontWeight = "bold"; 496 if(proxy_mensagens.is_local_folder(td1)) { 528 if(proxy_mensagens.is_local_folder(td1)) 529 { 497 530 var td1 = this.aux_local_folder_display(td1); 498 531 aux[2] = tr.name = aux[0]; // precisa trocar pelo nome real no banco do gears. 499 } else { 500 if(td1 == "INBOX"){ 532 } 533 else 534 { 535 if(td1 == "INBOX") 536 { 501 537 var td1 = get_lang("Inbox"); 502 538 } 503 539 else if (nm_box[0] == 'user') 540 { 504 541 if (nm_box.length > 1) 505 542 var td1 = nm_box[1] + '/' + lang_folder(td1); 506 543 else 507 544 var td1 = td1; 545 } 508 546 else 509 547 var td1 = lang_folder(td1); 510 548 } 511 549 512 if(proxy_mensagens.is_local_folder(td1)) { 550 if( proxy_mensagens.is_local_folder(td1)) 551 { 513 552 var td1 = this.aux_local_folder_display(td1); 514 553 }
Note: See TracChangeset
for help on using the changeset viewer.