Changeset 4803

Timestamp:

07/19/11 13:51:48 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - Acertando o msgs_number de msgs provenientes de resultados de pesquisa.r4655

File:

• trunk/expressoMail1_2/js/main.js (modified) (11 diffs)

trunk/expressoMail1_2/js/main.js

@@ -215 +215 @@
                         away=false;
                         var save_link = Element("save_message_options_"+border_id);
-                        save_link.onclick = function onclick(event) { openTab.toPreserve[border_id] = true; save_msg(border_id); } ;
+                        save_link.onclick = function onclick(event) {openTab.toPreserve[border_id] = true;save_msg(border_id);} ;
                         save_link.className = 'message_options';
                 };
@@ -786 +786 @@
                 }
 
-        // se a aba estiver aberta e selecionada, apenas a msg da aba é movida
-        if(currentTab.toString().indexOf("_r") != -1) 
-        { 
-            //se a aba for aberta atraves de uma pesquisa 
-                if(currentTab.toString().indexOf('_s') != -1) 
-                    msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf('_s')); 
-                else 
-                        msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf('_r'));
-        }
-        
+        if(currentTab.toString().indexOf("_r") != -1){
+                msgs_number = currentTab.toString().substr(0,currentTab.toString().indexOf("_r"));
+                if(msgs_number.indexOf("_s1"))
+                           msgs_number = msgs_number.replace('_s1', '');
+        }
+
         if (parseInt(msgs_number) > 0 || msgs_number.length > 0)
                 cExecute ("$this.imap_functions.move_messages&folder="+folder+"&msgs_number="+msgs_number+"&border_ID="+border_ID+"&sort_box_type="+sort_box_type+"&search_box_type="+search_box_type+"&sort_box_reverse="+sort_box_reverse+"&reuse_border="+border_ID+"&new_folder="+new_folder+"&new_folder_name="+new_folder_name+"&get_previous_msg="+preferences.delete_and_show_previous_message, handler_move_msgs);
@@ -913 +909 @@
                     }                   
                 } else {
-                        var a_types = { 6 : get_lang("Forward"),7 : get_lang("Reply"), 
+                        var a_types = {6 : get_lang("Forward"),7 : get_lang("Reply"), 
                                         8 : get_lang("Reply to all with history"),
                                         9 : get_lang("Reply without history"),
@@ -1421 +1417 @@
                 if (is_ie)
                 {
-                        body.contentWindow.document.attachEvent('onkeydown', function(event) { if(event.keyCode==27){delete_border(new_border_ID,'false');} if(event.keyCode==9) { Element('to_'+new_border_ID).focus(); Element('send_button_'+new_border_ID).focus(); return false;} }, false);
+                        body.contentWindow.document.attachEvent('onkeydown', function(event) {if(event.keyCode==27){delete_border(new_border_ID,'false');}if(event.keyCode==9) {Element('to_'+new_border_ID).focus();Element('send_button_'+new_border_ID).focus();return false;}}, false);
                 }
                 else
                 {
-                        body.contentWindow.document.addEventListener('keypress', function(event) { if(event.keyCode==27){delete_border(new_border_ID,'false');} if(event.keyCode==9) { Element('send_button_'+new_border_ID).focus(); event.preventDefault(); } }, false);
+                        body.contentWindow.document.addEventListener('keypress', function(event) {if(event.keyCode==27){delete_border(new_border_ID,'false');}if(event.keyCode==9) {Element('send_button_'+new_border_ID).focus();event.preventDefault();}}, false);
                 }
         }
@@ -1571 +1567 @@
                 }
                 if ((! openTab.toPreserve[ID]) && (openTab.imapUid[ID] != 0))
-                        cExecute ("$this.imap_functions.delete_msgs&folder="+openTab.imapBox[ID]+"&msgs_number="+openTab.imapUid[ID],function(data){ return });
+                        cExecute ("$this.imap_functions.delete_msgs&folder="+openTab.imapBox[ID]+"&msgs_number="+openTab.imapUid[ID],function(data){return});
                 delete_border(ID,'true'); // Becarefull: email saved automatically should be deleted. delete_border erase information about openTab
         }
@@ -1583 +1579 @@
                 
                 var save_link = Element("save_message_options_"+ID);
-                save_link.onclick = function onclick(event) { openTab.toPreserve[ID] = true; save_msg(ID); } ;
+                save_link.onclick = function onclick(event) {openTab.toPreserve[ID] = true;save_msg(ID);} ;
                 save_link.className = 'message_options';
         }
@@ -1784 +1780 @@
 {
         Element("send_button_"+border_id).style.visibility="visible";
-        var handler_delete_msg = function(data){ refresh(preferences.alert_new_msg); };
+        var handler_delete_msg = function(data){refresh(preferences.alert_new_msg);};
 
         if (data.append != true || !data)
@@ -1932 +1928 @@
                 watch_changes_in_msg(border_id);
                 write_msg(get_lang('Your message was save as draft in folder %1.', lang_folder(folder_name)));
-                setTimeout( function(){ RichTextEditor.saveFlag = 1; }, 1000 );
+                setTimeout( function(){RichTextEditor.saveFlag = 1;}, 1000 );
         }
 }
@@ -1965 +1961 @@
         tmp_folder_id=folder_id;
         message_id = openTab.imapUid[border_id];
-        var handler_save_msg = function(data){ return_save(data,this.tmp_border_id,this.tmp_folder_name,this.tmp_folder_id,this.message_id); }
+        var handler_save_msg = function(data){return_save(data,this.tmp_border_id,this.tmp_folder_name,this.tmp_folder_id,this.message_id);}
 
         var mail_as_plain = document.getElementById( 'textplain_rt_checkbox_' + border_id );
@@ -2045 +2041 @@
         tmp_border_id=border_id;
         tmp_folder_name=folder_name;
-        var handler_save_msg = function(data){ return_saveas(data,this.tmp_border_id,this.tmp_folder_name); }
+        var handler_save_msg = function(data){return_saveas(data,this.tmp_border_id,this.tmp_folder_name);}
         var textArea = document.createElement("TEXTAREA");
         textArea.style.display='none';
@@ -2584 +2580 @@
                         title_text_color: 'white',
                         button_x_img: '../phpgwapi/images/winclose.gif',
-                        border: true });
+                        border: true});
                 win.draw();
         }