Index: /trunk/prototype/modules/mail/js/foldertree.js =================================================================== --- /trunk/prototype/modules/mail/js/foldertree.js (revision 7612) +++ /trunk/prototype/modules/mail/js/foldertree.js (revision 7635) @@ -87,6 +87,32 @@ } -function draw_new_tree_folder(callback){ - var folders = DataLayer.get("folder", true); +function normalizeFolder( folders ){ + + if(folders == "") + return folders; + + if( !$.isArray( folders )){ + var array = []; + + for(var i in folders){ + + if(i.indexOf('(javascript)') < 0) + array[array.length] = folders[i]; + } + + folders = array; + + } + + return folders; + +} + +function draw_new_tree_folder(callback, force){ + + if(force) + DataLayer.remove('folder', false); + + var folders = normalizeFolder( DataLayer.get('folder') ); if(preferences.use_local_messages == 1){ @@ -283,10 +309,10 @@ if(folder_to_move == "tbody_box"){ move_msgs2(get_current_folder(), 'selected', 0, folder_to, to_folder_title,true); - return refresh(); + return; } //SE FOR DE UMA PESQUISA RAPIDA else if(ui.draggable.parents('[id^="content_id_"]')[0]){ move_search_msgs("content_id_"+border_id, folder_to, to_folder_title); - return refresh(); + return; } // eventnsagens : SE O DROP VIER DE UMA ABA ABERTA @@ -296,5 +322,5 @@ alternate_border(border_id); move_msgs2(folder, id_msg, border_id, folder_to, to_folder_title,true); - return refresh(); + return; } // SE O DROP VIER DA LISTA DE PASTAS @@ -496,5 +522,5 @@ } write_msg(get_lang("The folder %1 was successfully removed", folder_name)); - cExecute("$this.imap_functions.get_folders_list&onload=true", update_menu); + cExecute("$this.imap_functions.get_folders_list&onload=true", force_update_menu); } }); @@ -511,6 +537,6 @@ } */ }) - //FUNÃÃO DO eventNU FLUTUANTE EXCLUIR < END - //FUNÃÃO DO eventNU FLUTUANTE NOVA PASTA < BEGIN + //FUNÇÃO DO eventNU FLUTUANTE EXCLUIR < END + //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < BEGIN .end().find(".float-menu-new").click(function(){ $(this).parents(".float-menu").hide(); @@ -661,5 +687,5 @@ write_msg(get_lang('You must wait while the messages will be exported...'),true); }); - //FUNÃÃO DO eventNU FLUTUANTE NOVA PASTA < END + //FUNÇÃO DO eventNU FLUTUANTE NOVA PASTA < END } if(!$(".new_folder").length){ Index: /trunk/prototype/modules/mail/js/label.js =================================================================== --- /trunk/prototype/modules/mail/js/label.js (revision 7612) +++ /trunk/prototype/modules/mail/js/label.js (revision 7635) @@ -328,4 +328,32 @@ } +function SortByName(a, b){ + var aName = a.name.toLowerCase(); + var bName = b.name.toLowerCase(); + return ((aName < bName) ? -1 : ((aName > bName) ? 1 : 0)); +} + +//Reduz a quantidade de requests +function orderLabel(labels){ + + if(labels == "") + return labels; + + if(!$.isArray( labels )){ + var array = []; + + for(var i in labels){ + + array[ array.length ] = labels[ i ]; + + } + + labels = array; + + } + + return labels.sort(SortByName); +} + function init_label(data){ @@ -333,6 +361,7 @@ //TODO Mudar quando API abstrair atualizações no cache - DataLayer.remove('label',false); - labels = DataLayer.get('label',{criteria:{order: 'name'}}); + var labels = DataLayer.get('label'); + + labels = orderLabel( labels ); if(labels){ Index: /trunk/prototype/modules/filters/filters.js =================================================================== --- /trunk/prototype/modules/filters/filters.js (revision 7621) +++ /trunk/prototype/modules/filters/filters.js (revision 7635) @@ -21,6 +21,8 @@ * Verifica se a regra Fora de escritório está ativa */ -function outOfficeVerify() { - DataLayer.remove('filter', false); +function outOfficeVerify(force) { + if(force) + DataLayer.remove('filter', false); + var filters = DataLayer.get("filter"); var outoffice_active = false; Index: /trunk/prototype/modules/calendar/js/timezone.js =================================================================== --- /trunk/prototype/modules/calendar/js/timezone.js (revision 7579) +++ /trunk/prototype/modules/calendar/js/timezone.js (revision 7635) @@ -5,5 +5,5 @@ */ -var objTime = DataLayer.dispatch( "timezones", {teste:'123'} ); +var objTime = DataLayer.dispatch( "timezones" ); Timezone = { Index: /trunk/prototype/api/rest.js =================================================================== --- /trunk/prototype/api/rest.js (revision 6528) +++ /trunk/prototype/api/rest.js (revision 7635) @@ -94,13 +94,4 @@ success: function( dt, textStatus, jqXHR ){ - if(REST.isInvalidToken(dt)){ - REST.load('', true); - - if(!REST.me) - return {error: 'Empty session', title: 'Error in refresh token', description: 'Error in refresh token.'}; - - var ref = REST.resquests[this.url]; - result = REST.send(ref.url, ref.type, ref.data, ref.callback, ref.sync, ref.extraOptions) - } delete REST.resquests[this.url]; @@ -137,11 +128,4 @@ envelope['dataType'] = type[1]; - if(REST.me) - envelope = $.extend( envelope, { - beforeSend: function (xhr){ - xhr.setRequestHeader('Authorization', "OAUTH Bearer " + REST.me.token) - } - }); - if( extraOptions ) envelope = $.extend( envelope, extraOptions ); @@ -150,8 +134,4 @@ return( result ); - }, - - isInvalidToken: function(data){ - return ((data) && (data.error && data.error == 'invalid_grant') && (data.error_description == 'The access token provided has expired.')) ? true : false }, @@ -165,7 +145,5 @@ load: function(url, isRefresh){ - this.me = this.dispatch( (url || '') + "me", (isRefresh ? { - refreshToken: true - } : {}), false, true) + } Index: /trunk/expressoMail1_2/templates/default/main.css =================================================================== --- /trunk/expressoMail1_2/templates/default/main.css (revision 7634) +++ /trunk/expressoMail1_2/templates/default/main.css (revision 7635) @@ -350,6 +350,6 @@ .em_div_write_msg{ - height: 24px; - background: transparent; + height: 0px; + background: transparent; } Index: /trunk/expressoMail1_2/js/common_functions.js =================================================================== --- /trunk/expressoMail1_2/js/common_functions.js (revision 7624) +++ /trunk/expressoMail1_2/js/common_functions.js (revision 7635) @@ -499,6 +499,6 @@ msg_div.innerHTML = '
'+msg+' |
---|