Changeset 5456 for trunk/expressoMail1_2/js
- Timestamp:
- 01/31/12 11:13:48 (12 years ago)
- Location:
- trunk/expressoMail1_2/js
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/QuickCatalogSearch.js
r5423 r5456 123 123 switch(data_['type_catalog']) { 124 124 case 'G': 125 var extra_fields = (data_['extra_ldap_fields']).split("#"); 125 if(data['extra_ldap_fields'].length != 0) 126 var extra_fields = (data['extra_ldap_fields']).split("#"); 127 else 128 var extra_fields = []; 126 129 if(preferences.default_fields_quick_search != 0) { 127 130 details.append('<p><label class="attribute">' + utf8_decoder(data_[id_contact].cn[0]) + "</label>" + '<span class="value">' + data_[id_contact].mail[0] + '</span></p>'); … … 151 154 break; 152 155 default: 153 var extra_fields = (data_['extra_ldap_fields']).split("#"); 156 if(data['extra_ldap_fields'].length != 0) 157 var extra_fields = (data['extra_ldap_fields']).split("#"); 158 else 159 var extra_fields = []; 154 160 if(preferences.default_fields_quick_search != 0 || data_[id_contact].type_contact == "P") { 155 161 if(utf8_decoder(data_[id_contact].cn) == 'undefined') … … 279 285 switch (data['type_catalog']) { 280 286 case 'G': 281 var extra_fields = (data['extra_ldap_fields']).split("#"); 287 if(data['extra_ldap_fields'].length != 0) 288 var extra_fields = (data['extra_ldap_fields']).split("#"); 289 else 290 var extra_fields = []; 282 291 if(preferences.default_fields_quick_search != 0) { 283 292 details.append('<p><label class="attribute">' + utf8_decoder(data[first_contact].cn[0]) + "</label>" + '<span class="value">' + data[first_contact].mail[0] + "</span></p>"); 284 293 details.append('<p><label class="attribute">Telefone</label>' + '<span class="value">' + data[first_contact].telephonenumber[0] + '</span></p>'); 285 } 294 } 286 295 for (var i=0; i<=extra_fields.length-1; i++) { 287 296 var campo = extra_fields[i].substr(extra_fields[i].indexOf("|")+1); … … 305 314 details.append('<p><label class="attribute">Telefone</label>' + '<span class="value">' + data[first_contact].telephonenumber + '</span></p>'); 306 315 break; 307 default: 308 var extra_fields = (data['extra_ldap_fields']).split("#"); 316 default: 317 if(data['extra_ldap_fields'].length != 0) 318 var extra_fields = (data['extra_ldap_fields']).split("#"); 319 else 320 var extra_fields = []; 309 321 if(preferences.default_fields_quick_search != 0 || data[first_contact].type_contact == "P") { 310 322 if(utf8_decoder(data[first_contact].cn) != 'undefined') … … 354 366 switch(data['type_catalog']) { 355 367 case 'G': 356 var extra_fields = (data['extra_ldap_fields']).split("#"); 368 if(data['extra_ldap_fields'].length != 0) 369 var extra_fields = (data['extra_ldap_fields']).split("#"); 370 else 371 var extra_fields = []; 357 372 if(preferences.default_fields_quick_search != 0) { 358 373 details.append('<p><label class="attribute">' + utf8_decoder(data[this.value].cn[0]) + "</label>" + '<span class="value">' + data[this.value].mail[0] + "</span></p>"); … … 380 395 break; 381 396 default: 382 var extra_fields = (data['extra_ldap_fields']).split("#"); 397 if(data['extra_ldap_fields'].length != 0) 398 var extra_fields = (data['extra_ldap_fields']).split("#"); 399 else 400 var extra_fields = []; 383 401 if(preferences.default_fields_quick_search != 0 || data[this.value].type_contact == "P") { 384 402 if(utf8_decoder(data[this.value].cn) == 'undefined') -
trunk/expressoMail1_2/js/common_functions.js
r5455 r5456 558 558 connector.loadScript("QuickCatalogSearch"); 559 559 if (typeof(QuickCatalogSearch) == 'undefined'){ 560 setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'", "'+Type+'" )',500);560 setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'", "'+Type+'", "'+force+'")',500); 561 561 return false; 562 562 } … … 566 566 connector.loadScript("QuickSearchUser"); 567 567 if (typeof(QuickSearchUser) == 'undefined'){ 568 setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'", "'+Type+'" )',500);568 setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'", "'+Type+'", "'+force+'")',500); 569 569 return false; 570 570 } -
trunk/expressoMail1_2/js/draw_api.js
r5443 r5456 3366 3366 var tr1 = document.createElement("TR"); 3367 3367 var td1 = document.createElement("TD"); 3368 td1.innerHTML = '<button title="'+get_lang( "To")+':" id="to_button_'+ID+'" name="to" class="button small adress_button">'+get_lang("To")+':</button>';3368 td1.innerHTML = '<button title="'+get_lang('Search') + " | " + get_lang('Use F9 Key as shortcut.')+'" id="to_button_'+ID+'" name="to" class="button small adress_button">'+get_lang("To")+':</button>'; 3369 3369 //td1.setAttribute("noWrap","true"); 3370 3370 td1.style.width = "70px"; … … 3449 3449 tr2.style.display = 'none'; 3450 3450 var td2 = document.createElement("TD"); 3451 td2.innerHTML = '<button title=" Cc:" id="cc_button_'+ID+'" name="cc" class="button small adress_button">Cc:</button>';3451 td2.innerHTML = '<button title="'+get_lang('Search') + " | " + get_lang('Use F9 Key as shortcut.')+'" id="cc_button_'+ID+'" name="cc" class="button small adress_button">Cc:</button>'; 3452 3452 //td2.setAttribute("noWrap","true"); 3453 3453 //td2.style.width = "1%"; … … 3523 3523 var td3 = document.createElement("TD"); 3524 3524 //td3.setAttribute("noWrap","true"); 3525 td3.innerHTML = '<button title="'+get_lang( "CCo")+':" id="cc_button_'+ID+'" name="cco" class="button small adress_button">'+get_lang("CCo")+':</button>';3525 td3.innerHTML = '<button title="'+get_lang('Search') + " | " + get_lang('Use F9 Key as shortcut.')+'" id="cc_button_'+ID+'" name="cco" class="button small adress_button">'+get_lang("CCo")+':</button>'; 3526 3526 //td3.style.width = "1%"; 3527 3527
Note: See TracChangeset
for help on using the changeset viewer.