Changeset 5754 for trunk/expressoMail1_2/js/main.js

Timestamp:

03/20/12 08:56:56 (12 years ago)

Author:

gustavo

Message:

Ticket #2549 - Definição de DOCTYPE no html para viabilizar cross-browsing no ExpressoMail?

File:

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

trunk/expressoMail1_2/js/main.js

@@ -154 +154 @@
         
         $("#divAppbox").css("padding-left", "0px");
-        
 }
 
@@ -580 +579 @@
                                                 },
                                                 helper: function(event){
-                                                        if($(this).find("input:checkbox").attr("checked") != "checked"){
-                                                                $(this).find("input:checkbox").trigger('click');
-                                                                $(this).addClass("selected_msg");
-                                                        }
-                                                        if($("#table_box").find("tr input:checked").length > 1)
-                                                                return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"}));
-                                                        if(     $(this).find(".td_msg_subject").text().length > 18 )
-                                                                return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"}));
-                                                        else
-                                                                return $(DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text(), type: "messages"}));
+                                                                if($(this).find("input:checkbox").attr("checked") != "checked"){
+                                                                        $(this).find("input:checkbox").trigger('click');
+                                                                        $(this).addClass("selected_msg");
+                                                                }
+                                                                if($("#table_box").find("tr input:checked").length > 1)
+                                                                        return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : (($("#table_box").find("tr input:checked")).length+" mensagens selecionadas"), type: "messages"})+"</td></tr>");
+                                                                if(     $(this).find(".td_msg_subject").text().length > 18 )
+                                                                        return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text().substring(0,18) + "...", type: "messages"})+"</td></tr>");
+                                                                else
+                                                                        return $("<tr><td>"+DataLayer.render('../prototype/modules/mail/templates/draggin_box.ejs', {texto : $(this).find(".td_msg_subject").text(), type: "messages"})+"</td></tr>");
                                                 },
-                                                cursorAt: {cursor: "move", top: 5, left: 56},
-                                                refreshPositions: true ,
-                                                scroll: true, 
-                                                scrollSensitivity: 100,
-                                                scrollSpeed: 100,
+                                                iframeFix: true,
+                                                delay: 150,
+                                                cursorAt: {top: 5, left: 56},
+                                                refreshPositions: true,
                                                 containment: "#divAppbox"
                                         }).bind("contextmenu", function(){
@@ -639 +637 @@
                 update_menu();
                 resizeMailList();
+
         }
 
@@ -1814 +1813 @@
            if (txtarea != null){
                   if (data.body != undefined)
-                    txtarea.value = data.body.replace( new RegExp('<pre>((.\n*)*)</pre>'),'$1');
+                    txtarea.value = data.body;
               if (preferences.use_signature == "1")
             txtarea.value += '\n' + signature;     
@@ -2209 +2208 @@
         input_folder.style.display='none';
         input_folder.name = "folder";
-        input_folder.value = folder;
-        
-        var input_type = document.createElement("INPUT");
-        input_type.style.display='none';
-        input_type.name = "type";
-        input_type.value = RichTextEditor.plain[ID] ? 'plain' : 'html';
+        input_folder.value = folder;      
         
         var uids = document.createElement("INPUT");
@@ -2254 +2248 @@
         form.appendChild(textArea);
         form.appendChild(input_folder);
-        form.appendChild(input_type);
 
         // Implementação do In_Reply_To e References
@@ -3588 +3581 @@
             form.folder = folder_id;
             form.body = RichTextEditor.getData("body_"+border_id);
-            form.type =  RichTextEditor.plain[border_id] ? 'plain' : 'html';
-            form.attachments = listAttachment(border_id) ;
+            form.attachments = listAttachment(border_id);
             form.uidsSave = uidsSave[border_id].toString();
             return( form );