Changeset 7485 for trunk

Timestamp:

10/31/12 15:07:22 (11 years ago)

Author:

antonio

Message:

Ticket #3178 - Alterações na formatação do código

File:

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

trunk/expressoMail1_2/js/main.js

@@ -1343 +1343 @@
                 }
 
-                if (openTab.type[currentTab] > 1){
+                if (openTab.type[currentTab] > 1)
+                {
                         msg_to_delete = Element(msgs_number);
                         if (parseInt(preferences.delete_and_show_previous_message) && msg_to_delete)
                         {
-                                if (msg_to_delete.previousSibling){
+                                if (msg_to_delete.previousSibling)
+                                {
                                         var previous_msg = msg_to_delete.previousSibling.id;
                                         //cExecute("$this.imap_functions.get_info_msg&msg_number="+previous_msg+"&msg_folder=" + current_folder, show_msg);
@@ -1372 +1374 @@
                                 }
                                 //se houver pagina anterior a paginação deve ser refeita
-                                else if (current_page > 1){
-                                        $('#msg_opt_previous_'+msg_to_delete.getAttribute('id') + '_r').trigger('click');
+                                else 
+                                {
+                                        if (current_page > 1)
+                                        {
+                                                $('#msg_opt_previous_'+msg_to_delete.getAttribute('id') + '_r').trigger('click');
+                                        }
+                                        else
+                                        {
+                                                var border_id = $("#tbody_box").find("tr:eq(1)").attr("id");
+                                                var folderName = current_folder;
+                                                if(border_id)
+                                                {
+                                                        $.ajax({
+                                                                url: 'controller.php?' + $.param({
+                                                                        action: '$this.imap_functions.get_info_msg',
+                                                                        msg_number: border_id, 
+                                                                        msg_folder: folderName,
+                                                                        decoded: true 
+                                                                }),
+                                                                success: function( data ){
+                                                                        data = connector.unserialize( data );
+                                                                        delete_border(currentTab,'false');
+                                                                        if( data )
+                                                                        {
+                                                                                show_msg( data );
+                                                                        }
+                                                                },
+                                                                beforeSend: function( jqXHR, settings ){
+                                                                        connector.showProgressBar();
+                                                                },
+                                                                complete: function( jqXHR, settings ){
+                                                                        connector.hideProgressBar();
+                                                                }
+                                                        });
+                                                }
+                                                else 
+                                                {
+                                                        delete_border(currentTab,'false');
+                                                }
+                                        }
                                 }
-                                else{
-                    
-                    var border_id = $("#tbody_box").find("tr:eq(1)").attr("id");
-                    var folderName = current_folder;
-                    if(border_id){
-                        $.ajax({
-                              url: 'controller.php?' + $.param( {action: '$this.imap_functions.get_info_msg',
-                                                  msg_number: border_id, 
-                                                  msg_folder: folderName,
-                                                  decoded: true } ),
-                              success: function( data ){
-                                  data = connector.unserialize( data );
-                                  
-                                  delete_border(currentTab,'false');
-
-                                  if( data )
-                                  show_msg( data );
-                              },
-                              beforeSend: function( jqXHR, settings ){
-                                connector.showProgressBar();
-                              },
-                              complete: function( jqXHR, settings ){
-                                connector.hideProgressBar();
-                              }
-                        });
-                    } else {
-                        delete_border(currentTab,'false');
-                    }
-                    
-                }
-                                        
-                        }
-                        else{
+                        }
+                        else
+                        {
                                 delete_border(currentTab,'false');
                         }
+                        
                         if(msg_to_delete)
+                        {
                                 mail_msg.removeChild(msg_to_delete);
+                        }
 
                         // Update Box BgColor
                         var box = Element("tbody_box");
-                        if(box.childNodes.length > 0){
+                        if(box.childNodes.length > 0)
+                        {
                                 updateBoxBgColor(box.childNodes);
                         }
-                        if(folder == get_current_folder()){
+                        if(folder == get_current_folder())
+                        {
                                 Element('tot_m').innerHTML = parseInt(Element('tot_m').innerHTML) - 1;
                         }