Changeset 7566


Ignore:
Timestamp:
11/26/12 10:09:44 (8 years ago)
Author:
marcosw
Message:

Ticket #3088 - Correção exibição de mensagem ao arquivar

Location:
trunk/expressoMail1_2/js
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/js/main.js

    r7563 r7566  
    13381338                } 
    13391339                mail_msg = ( Element("divScrollMain_"+numBox) ) ? Element("divScrollMain_"+numBox).firstChild.firstChild : Element("divScrollMain_0").firstChild.firstChild; 
    1340                 if (data.msgs_number.length == 1){ 
    1341                         write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name)); 
    1342                 } 
    1343                 else{ 
    1344                         write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name)); 
    1345                 } 
    13461340 
    13471341                if (openTab.type[currentTab] > 1) 
     
    14851479                } 
    14861480 
    1487                 if (data.msgs_number.length == 1) 
    1488                         write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name)); 
    1489                 else 
    1490                         write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name)); 
     1481                //Se pref. usar mensagens locais ativada e não for operação de arquivamento exibe mensagem de remoção. 
     1482                if(preferences.use_local_messages == 1){ 
     1483                        if(!expresso_mail_archive.isArchiveOperation){ 
     1484                                if (data.msgs_number.length == 1) 
     1485                                        write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name)); 
     1486                                else 
     1487                                        write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name)); 
     1488                        } 
     1489                } else { 
     1490                        if (data.msgs_number.length == 1) 
     1491                                write_msg(get_lang("The message was moved to folder ") + lang_folder(data.new_folder_name)); 
     1492                        else 
     1493                                write_msg(get_lang("The messages were moved to folder ") + lang_folder(data.new_folder_name)); 
     1494                }        
     1495 
    14911496                if (data.border_ID.indexOf('r') != -1){ 
    14921497                        if (parseInt(preferences.delete_and_show_previous_message) && folder == get_current_folder()){ 
  • trunk/expressoMail1_2/js/main.min.js

    r7563 r7566  
     1 
    12var time_refresh=300000;var check_services_interval=2000;var check_services_tryouts=1;var check_services_tryouts_limit=5;var autosave_time=40000;var results_search_messages="";var cabecalho='<h4>ExpressoLivre - ExpressoMail</h4>';var auxNotificationCriteriaVetor=[];var auxNotification;var countNewMessage=0;var notifyNewMessageFilter=[];var dynamicPersonalContacts=new Array();var dynamicPersonalGroups=new Array();var dynamicContacts=new Array();var topContact=0;DataLayer.get("folder",true);if(!String.prototype.trim){String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,'');}} 
    23function mount_url_folder(folders){return folders.join(cyrus_delimiter);} 
     
    214215return false;} 
    215216if(data.status==false){write_msg(get_lang("You don't have permission for this operation in this shared folder!"));return false;} 
    216 mail_msg=(Element("divScrollMain_"+numBox))?Element("divScrollMain_"+numBox).firstChild.firstChild:Element("divScrollMain_0").firstChild.firstChild;if(data.msgs_number.length==1){write_msg(get_lang("The message was moved to folder ")+lang_folder(data.new_folder_name));} 
    217 else{write_msg(get_lang("The messages were moved to folder ")+lang_folder(data.new_folder_name));} 
    218 if(openTab.type[currentTab]>1) 
     217mail_msg=(Element("divScrollMain_"+numBox))?Element("divScrollMain_"+numBox).firstChild.firstChild:Element("divScrollMain_0").firstChild.firstChild;if(openTab.type[currentTab]>1) 
    219218{msg_to_delete=Element(msgs_number);if(parseInt(preferences.delete_and_show_previous_message)&&msg_to_delete) 
    220219{if(msg_to_delete.previousSibling) 
     
    252251{msg_to_delete=Element(data.msgs_number[i]);if(msg_to_delete) 
    253252mail_msg.removeChild(msg_to_delete);} 
    254 if(data.msgs_number.length==1) 
     253if(preferences.use_local_messages==1){if(!expresso_mail_archive.isArchiveOperation){if(data.msgs_number.length==1) 
    255254write_msg(get_lang("The message was moved to folder ")+lang_folder(data.new_folder_name));else 
    256 write_msg(get_lang("The messages were moved to folder ")+lang_folder(data.new_folder_name));if(data.border_ID.indexOf('r')!=-1){if(parseInt(preferences.delete_and_show_previous_message)&&folder==get_current_folder()){delete_border(data.border_ID,'false');show_msg(data.previous_msg);} 
     255write_msg(get_lang("The messages were moved to folder ")+lang_folder(data.new_folder_name));}}else{if(data.msgs_number.length==1) 
     256write_msg(get_lang("The message was moved to folder ")+lang_folder(data.new_folder_name));else 
     257write_msg(get_lang("The messages were moved to folder ")+lang_folder(data.new_folder_name));} 
     258if(data.border_ID.indexOf('r')!=-1){if(parseInt(preferences.delete_and_show_previous_message)&&folder==get_current_folder()){delete_border(data.border_ID,'false');show_msg(data.previous_msg);} 
    257259else{delete_border(data.border_ID,'false');}} 
    258260if(folder==get_current_folder()){var n_total_msg=parseInt(Element('tot_m').innerHTML)-data.msgs_number.length;n_total_msg=n_total_msg>=0?n_total_msg:0;draw_paging(n_total_msg);Element('tot_m').innerHTML=n_total_msg;totalFolderMsgs-=data.msgs_number.length;} 
Note: See TracChangeset for help on using the changeset viewer.