Changeset 7635
- Timestamp:
- 12/10/12 17:00:32 (11 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/js/common_functions.js
r7624 r7635 499 499 500 500 msg_div.innerHTML = '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tbody><tr><th width="40%"></th><th noWrap class="action_info_th">'+msg+'</th><th width="40%"></th></tr></tbody></table>'; 501 502 old_divStatusBar.style.display = 'none';501 502 //old_divStatusBar.style.display = 'none'; 503 503 msg_div.style.display = ''; 504 504 // Nao ponha var na frente!! jakjr -
trunk/expressoMail1_2/js/doiMenuData.js
r7544 r7635 86 86 */ 87 87 function getLabels(){ 88 var labels = DataLayer.get('label',{criteria:{order: 'name'}}); 88 var labels = DataLayer.get('label'); 89 90 labels = orderLabel( labels ); 91 89 92 var menuLabelItems = {}; 90 93 menuLabelItems["new"] = { -
trunk/expressoMail1_2/js/draw_api.js
r7615 r7635 476 476 477 477 function draw_tree_labels(){ 478 labels = DataLayer.get('label',{criteria:{order: 'name'}}); 479 if(!$("#MyMarckersList").length) 478 labels = DataLayer.get('label'); 479 480 labels = orderLabel( labels ); 481 482 if(!$("#MyMarckersList").length) 480 483 var myLabels = $('#content_folders').append("<div id='MyMarckersList' class='acc-list list-label' ></div>").find("#MyMarckersList"); 481 484 else … … 589 592 } 590 593 591 function update_menu(data){ 594 function force_update_menu(data){ 595 update_menu(data, true) 596 } 597 598 599 function update_menu(data, forceLoadFolders){ 592 600 /* 593 601 * @AUTHOR Rodrigo Souza dos Santos … … 637 645 folders = data; 638 646 } 639 draw_new_tree_folder( );647 draw_new_tree_folder(false, forceLoadFolders); 640 648 draw_tree_labels(); 641 649 if(Element("table_quota")) … … 4517 4525 if(parseInt(preferences.use_dynamic_contacts)){ 4518 4526 4519 REST.get("/usercontacts", false, updateDynamicContact);4527 //REST.get("/usercontacts", false, updateDynamicContact); 4520 4528 4521 4529 //PREPARAÇÃO DA ARRAY DOS CONTATOS DINÂMICOS -
trunk/expressoMail1_2/js/main.js
r7628 r7635 298 298 299 299 if(parseInt(preferences.use_dynamic_contacts)){ 300 var load_dynamics = function(){ 301 updateDynamicContact(); 302 updateDynamicPersonalContacts(); 303 updateDynamicPersonalGroups(); 304 }; 305 load_dynamics(); 306 } 300 updateDynamicContact(); 301 } 302 307 303 } 308 304 var handler_automatic_trash_cleanness = function(data){ … … 1540 1536 msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf('_r')); 1541 1537 } 1542 if (msgs_number) {1543 refresh();1544 }1545 else{1538 // if (msgs_number) { 1539 // refresh(); 1540 // } 1541 if (!msgs_number){ 1546 1542 $("#"+get_current_folder()).find('span:first').addClass('selected'); 1547 1543 } … … 1614 1610 get_previous_msg: ( !not_opem_previus ? preferences.delete_and_show_previous_message : false ), 1615 1611 decoded: true } ), 1616 1612 async: true, 1617 1613 success: function( data ){ 1618 1614 data = connector.unserialize( data ); … … 5280 5276 return write_msg(get_lang("Permission denied")); 5281 5277 } 5282 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);5278 cExecute("$this.imap_functions.get_folders_list&onload=true", force_update_menu); 5283 5279 }, 5284 5280 beforeSend: function( jqXHR, settings ){ -
trunk/expressoMail1_2/js/search.js
r7561 r7635 1886 1886 handler('none'); 1887 1887 else 1888 cExecute( "$this.imap_functions.search_msg", handler_refresh, "condition="+openTab.condition[currentTab]+"&page="+EsearchE.page+"&sort_type="+sort_type); 1888 if(openTab.condition[currentTab] != '') 1889 cExecute( "$this.imap_functions.search_msg", handler_refresh, "condition="+openTab.condition[currentTab]+"&page="+EsearchE.page+"&sort_type="+sort_type); 1889 1890 } 1890 1891 -
trunk/expressoMail1_2/templates/default/main.css
r7634 r7635 350 350 351 351 .em_div_write_msg{ 352 height: 24px;353 352 height: 0px; 353 background: transparent; 354 354 } 355 355 -
trunk/prototype/api/rest.js
r6528 r7635 94 94 success: function( dt, textStatus, jqXHR ){ 95 95 96 if(REST.isInvalidToken(dt)){97 REST.load('', true);98 99 if(!REST.me)100 return {error: 'Empty session', title: 'Error in refresh token', description: 'Error in refresh token.'};101 102 var ref = REST.resquests[this.url];103 result = REST.send(ref.url, ref.type, ref.data, ref.callback, ref.sync, ref.extraOptions)104 }105 96 delete REST.resquests[this.url]; 106 97 … … 137 128 envelope['dataType'] = type[1]; 138 129 139 if(REST.me)140 envelope = $.extend( envelope, {141 beforeSend: function (xhr){142 xhr.setRequestHeader('Authorization', "OAUTH Bearer " + REST.me.token)143 }144 });145 146 130 if( extraOptions ) 147 131 envelope = $.extend( envelope, extraOptions ); … … 150 134 151 135 return( result ); 152 },153 154 isInvalidToken: function(data){155 return ((data) && (data.error && data.error == 'invalid_grant') && (data.error_description == 'The access token provided has expired.')) ? true : false156 136 }, 157 137 … … 165 145 166 146 load: function(url, isRefresh){ 167 this.me = this.dispatch( (url || '') + "me", (isRefresh ? { 168 refreshToken: true 169 } : {}), false, true) 147 170 148 } 171 149 -
trunk/prototype/modules/calendar/js/timezone.js
r7579 r7635 5 5 */ 6 6 7 var objTime = DataLayer.dispatch( "timezones" , {teste:'123'});7 var objTime = DataLayer.dispatch( "timezones" ); 8 8 9 9 Timezone = { -
trunk/prototype/modules/filters/filters.js
r7621 r7635 21 21 * Verifica se a regra Fora de escritório está ativa 22 22 */ 23 function outOfficeVerify() { 24 DataLayer.remove('filter', false); 23 function outOfficeVerify(force) { 24 if(force) 25 DataLayer.remove('filter', false); 26 25 27 var filters = DataLayer.get("filter"); 26 28 var outoffice_active = false; -
trunk/prototype/modules/mail/js/foldertree.js
r7612 r7635 87 87 } 88 88 89 function draw_new_tree_folder(callback){ 90 var folders = DataLayer.get("folder", true); 89 function normalizeFolder( folders ){ 90 91 if(folders == "") 92 return folders; 93 94 if( !$.isArray( folders )){ 95 var array = []; 96 97 for(var i in folders){ 98 99 if(i.indexOf('(javascript)') < 0) 100 array[array.length] = folders[i]; 101 } 102 103 folders = array; 104 105 } 106 107 return folders; 108 109 } 110 111 function draw_new_tree_folder(callback, force){ 112 113 if(force) 114 DataLayer.remove('folder', false); 115 116 var folders = normalizeFolder( DataLayer.get('folder') ); 91 117 92 118 if(preferences.use_local_messages == 1){ … … 283 309 if(folder_to_move == "tbody_box"){ 284 310 move_msgs2(get_current_folder(), 'selected', 0, folder_to, to_folder_title,true); 285 return refresh();311 return; 286 312 } 287 313 //SE FOR DE UMA PESQUISA RAPIDA 288 314 else if(ui.draggable.parents('[id^="content_id_"]')[0]){ 289 315 move_search_msgs("content_id_"+border_id, folder_to, to_folder_title); 290 return refresh();316 return; 291 317 } 292 318 // eventnsagens : SE O DROP VIER DE UMA ABA ABERTA … … 296 322 alternate_border(border_id); 297 323 move_msgs2(folder, id_msg, border_id, folder_to, to_folder_title,true); 298 return refresh();324 return; 299 325 } 300 326 // SE O DROP VIER DA LISTA DE PASTAS … … 496 522 } 497 523 write_msg(get_lang("The folder %1 was successfully removed", folder_name)); 498 cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu);524 cExecute("$this.imap_functions.get_folders_list&onload=true", force_update_menu); 499 525 } 500 526 }); … … 511 537 } */ 512 538 }) 513 //FUN ÃÃO DO eventNU FLUTUANTE EXCLUIR < END514 //FUN ÃÃO DO eventNU FLUTUANTE NOVA PASTA < BEGIN539 //FUNÇÃO DO eventNU FLUTUANTE EXCLUIR < END 540 //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < BEGIN 515 541 .end().find(".float-menu-new").click(function(){ 516 542 $(this).parents(".float-menu").hide(); … … 661 687 write_msg(get_lang('You must wait while the messages will be exported...'),true); 662 688 }); 663 //FUN ÃÃO DO eventNU FLUTUANTE NOVA PASTA < END689 //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < END 664 690 } 665 691 if(!$(".new_folder").length){ -
trunk/prototype/modules/mail/js/label.js
r7612 r7635 328 328 } 329 329 330 function SortByName(a, b){ 331 var aName = a.name.toLowerCase(); 332 var bName = b.name.toLowerCase(); 333 return ((aName < bName) ? -1 : ((aName > bName) ? 1 : 0)); 334 } 335 336 //Reduz a quantidade de requests 337 function orderLabel(labels){ 338 339 if(labels == "") 340 return labels; 341 342 if(!$.isArray( labels )){ 343 var array = []; 344 345 for(var i in labels){ 346 347 array[ array.length ] = labels[ i ]; 348 349 } 350 351 labels = array; 352 353 } 354 355 return labels.sort(SortByName); 356 } 357 330 358 function init_label(data){ 331 359 … … 333 361 334 362 //TODO Mudar quando API abstrair atualizações no cache 335 DataLayer.remove('label',false); 336 labels = DataLayer.get('label',{criteria:{order: 'name'}}); 363 var labels = DataLayer.get('label'); 364 365 labels = orderLabel( labels ); 337 366 338 367 if(labels){
Note: See TracChangeset
for help on using the changeset viewer.