Changeset 5702 for trunk/expressoMail1_2/js

Timestamp:

03/12/12 11:34:43 (12 years ago)

Author:

cristiano

Message:

Ticket #2497 - Mensagem de erro em falha no upload, alerta de arquivos em upload ao enviar

Location:

trunk/expressoMail1_2/js

Files:

• abas.js (modified) (1 diff)
• draw_api.js (modified) (1 diff)
• main.js (modified) (4 diffs)

trunk/expressoMail1_2/js/abas.js

@@ -410 +410 @@
              if($('#fileupload_msg'+ID).find('.in-progress').length)
              {
-                 msg = 'Existem arqivos sendo enviados para o servidor.';
+                 msg = 'Existem anexos sendo enviados para o servidor.';
                  buttons = ['Descartar alterações e anexos', 'Salvar estado atual fechar', 'Continuar editando']; 
                  width = 560;

trunk/expressoMail1_2/js/draw_api.js

@@ -4222 +4222 @@
 
                 done: function(e, data){
-                        if(!!data.result && data.result != "[]"){
-                                var newAttach = jQuery.parseJSON(data.result);
-                                fileUploadMSG.find('.in-progress:first').parents('p').append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>');
-                                addAttachment(ID,newAttach['mailAttachment'][0][0].id);
+                        if(!!data.result && data.result != "[]" ){
+                                var newAttach = jQuery.parseJSON(data.result);                               
+                                if(newAttach.rollback === false)
+                                {
+                                    fileUploadMSG.find('.in-progress:first').parents('p').append('<input type="hidden" name="fileId[]" value="'+newAttach['mailAttachment'][0][0].id+'"/>');
+                                    addAttachment(ID,newAttach['mailAttachment'][0][0].id);
+                                }
+                                else                             
+                                  fileUploadMSG.find('.in-progress:first').parents('p').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');   
                                 
                         }else {
-                                fileUploadMSG.find(' .progress.on-complete:first').removeClass('on-complete').parents('p').find('.status-upload').addClass('ui-icon ui-icon-cancel');
+                                fileUploadMSG.find(' .progress.on-complete:first').parents('p').find('.status-upload').append('Erro ao fazer upload!').addClass('message-attach-error');
                         }
                         fileUploadMSG.find(' .in-progress:first').remove();

trunk/expressoMail1_2/js/main.js

@@ -2146 +2146 @@
 
 function send_message(ID, folder, folder_name){
-
-        if (preferences.auto_save_draft == 1)
-            autoSaveControl.status[ID] = true;
-
-        var save_link = Element("save_message_options_"+ID);
+     if(!zebraDiscardEventDialog && $('#fileupload_msg'+ID).find('.in-progress').length )
+     {
+         zebraDiscardEventDialog = true;
+         window.setTimeout(function() {
+         $.Zebra_Dialog('Existem anexos sendo enviados para o servidor. Caso envie sua mensagem agora estes arquivos serão perdidos.', {
+                    'type':     'question',
+                    'overlay_opacity': '0.5',
+                    'buttons':  ['Descartar anexos e enviar', 'Continuar editando e esperar anexos'],
+                    'width' : 500,
+                    'onClose':  function(clicked) {
+                            if(clicked == 'Descartar anexos e enviar' ) 
+                              send_valided_message(ID, folder, folder_name);
+
+                            window.setTimeout(function() {
+                                    zebraDiscardEventDialog = false;
+                            }, 500);
+                    }
+             })
+          }, 300); 
+
+     }
+     else
+       send_valided_message(ID, folder, folder_name);     
+}
+
+function send_valided_message(ID, folder, folder_name)
+{ 
+        
+       if (preferences.auto_save_draft == 1)
+           autoSaveControl.status[ID] = true;
+        
+        var save_link = Element("save_message_options_"+ID);
         var onClick = save_link.onclick;
         save_link.onclick = '';
@@ -2220 +2247 @@
         msgId.value = currentTab;
 
-
-
         form.appendChild(msgId);
         form.appendChild(save_folder);
@@ -2227 +2252 @@
         form.appendChild(msg_attachments);
 
-    var mail_type = document.createElement('input');
+        var mail_type = document.createElement('input');
         mail_type.setAttribute('type', 'hidden');
         mail_type.name = 'type';
         mail_type.value = ( mail_as_plain ) ? 'plain' : 'html';
-    form.parentNode.appendChild(mail_type);
+        form.parentNode.appendChild(mail_type);
 
         var _subject = trim(Element("subject_"+ID).value);
@@ -2272 +2297 @@
                 }
         }
-}
+
+}
+
+
 function is_valid_email(campo){ 
         var invalidEmail = searchEmail(campo);