Changeset 7608

Timestamp:

12/04/12 15:49:21 (11 years ago)

Author:

fernando

Message:

Ticket #3218 - Inserir validação de mensagem ao sair do EM

Location:

trunk/expressoMail1_2/js

Files:

• abas.js (modified) (1 diff)
• common_functions.js (modified) (2 diffs)
• mail_archiver.js (modified) (2 diffs)

trunk/expressoMail1_2/js/abas.js

@@ -417 +417 @@
 
 function draftTests(ID, msg_sent){
-    
-       
         if( openTab.toPreserve[ID] = false)
         {

trunk/expressoMail1_2/js/common_functions.js

@@ -102 +102 @@
 
 function unloadMess(){
-        if (typeof BordersArray == 'undefined') return; // We're not on expressoMail
+    if (typeof BordersArray == 'undefined') return; // We're not on expressoMail
         if (typeof(expresso_mail_sync) != "undefined" && expresso_mail_sync.working) {
                 var mess = get_lang("You're about archiving your e-mails from server. Do you really want to stop this action?");
@@ -108 +108 @@
         }
         else {
-            for (var i = 0; i < BordersArray.length; i++) 
-                    if(BordersArray[i].sequence > 0 && (!isNaN(BordersArray[i].sequence)&&parseInt(BordersArray[i].sequence) == BordersArray[i].sequence) )
-                            return get_lang('There are still editing posts, really want to leave the page')+'?';
+                var ret = null;
+                $(".conteudo .new-msg-head-buttons .save").each(function(index) { //Pega todos os botões "Save" de todas as abas
+                        if($(this).is(':disabled')) { //se a mensagem estiver salva (botão Salvar desabilitado)
+                                ret = null;
+                        } else { //se estiver em modo edição (botão Salvar habilitado)
+                                ret = get_lang('There are still editing posts, really want to leave the page')+'?';
+                        }
+                });
+
+                return ret;
         }
 }

trunk/expressoMail1_2/js/mail_archiver.js

@@ -1365 +1365 @@
         var ExpSerialized = expresso_mail_archive.pattern.toExpressoHeader(returnService.getReturn()[i]);
         var msgitem = connector.unserialize(ExpSerialized);
+        
         // correção para por no padrao certo, se nao fizer isso buga a listagem
-        msgitem_temp = msgitem.msg_sample;
-        msgitem.msg_sample = { "body": msgitem_temp };
+        msgitem.msg_sample = { "body": msgitem.msg_sample };
+
         msglist.push(msgitem);//usando connector.unserialize sobre o header mapeado no layout abaixo
         expresso_mail_archive.ServiceReturnObjectList.push(returnService.getReturn()[i]); //add each one service return data into this embeded object array
@@ -1551 +1552 @@
        
    }catch(e){
-
+        alert("Erro ao obter mensagens");
    }
 }