Changeset 7610 for trunk

Timestamp:

12/05/12 10:14:36 (11 years ago)

Author:

angelo

Message:

Ticket #3197 - Reduzir tempo de carregamento do modulo Expresso Mail

Location:

trunk

Files:

• expressoMail1_2/js/draw_api.js (modified) (3 diffs)
• prototype/modules/mail/templates/attachment.ejs (modified) (1 diff)

trunk/expressoMail1_2/js/draw_api.js

@@ -4818 +4818 @@
         $(this).prev().show();
         });
-        fileUploadMSG.find(".button").button().filter(".fileinput-button").find(".ui-button-text").css("margin-top", "2px").find("input:file").fileupload({
+        fileUploadMSG.find(".fileUploadButton, .message-attach-link").button().filter(".fileUploadButton").click(function(){
+            fileUploadMSG.find("input:file").trigger("click");
+    });
+
+    fileUploadMSG.find("input:file").fileupload({
                 //singleFileUploads : true,fileUploadMSG
                 sequentialUploads: true, 
@@ -4994 +4998 @@
             });
         }*/
-        }).css({
+        });/*.css({
                 "height" : "20px", 
                 "width": (is_webkit ? "205px" : "100px"), 
@@ -5000 +5004 @@
         "-moz-transform" : "rotate(-180deg) translate(5px, -0.5px) scale(1.1)",  
         "-webkit-transform" : "rotate(-180deg) translate(0px, 0px)"
-        }).end().end().end().filter(".message-attach-link").click(function(){
+        }).end().end().end().*/
+    fileUploadMSG.find(".message-attach-link").click(function(){
                 jQuery('#message-attach-dialog').html(DataLayer.render("../prototype/modules/attach_message/attach_message.ejs", {}));
                 var lastFolderSelected = $('#content_folders .folder.selected');

trunk/prototype/modules/mail/templates/attachment.ejs

@@ -1 @@
-<div id="fileupload_msg<%=data.ID%>" class="fileupload" style="margin : 15px 0px -15px -10px; padding-bottom : 5px;">
-        <div class="row fileupload-buttonbar">
-                <div class="button-files-upload">
-                        <<%= is_webkit ? 'button' : 'span style="height: 22px; cursor:pointer;"' %>  class="fileinput-button button small">
-                                <span style="margin-top: 4px; cursor:pointer;"><i class="icon-plus icon-white"></i>Anexar arquivos</span>
-                                <INPUT type="file" id="fileInput<%=data.ID%>" name="files[]" multiple></INPUT>
+<div id="fileupload_msg<%=data.ID%>" class="fileupload" style="margin : 15px 0px 0px 0px; padding-bottom : 5px;">
+                        <button class="fileUploadButton">Anexar Arquivos</button>
+                        <INPUT type="file" id="fileInput<%=data.ID%>" name="files[]" style="display:none;" multiple></INPUT>
                         </<%= is_webkit ? 'button' : 'span' %>>
-                        <button class="message-attach-link button small">
+                        <button class="message-attach-link button-small">
                                 <span>Anexar mensagens</span>
-                        </button>
-                </div>
-        </div>
-        <br />
+                        </button>               
         <div class="files-list" style="margin: 5px; padding: 5px;">
                 <div class="attachments-list ui-corner-all" style="display:none;"></div>