Changeset 5846

Timestamp:

03/29/12 00:10:47 (12 years ago)

Author:

angelo

Message:

Ticket #2565 - Duplicacao de abas e envio de anexo de mensagens

Location:

trunk

Files:

• expressoMail1_2/js/draw_api.js (modified) (2 diffs)
• prototype/modules/attach_message/attach_message.ejs (modified) (1 diff)
• prototype/modules/attach_message/attach_message.js (modified) (3 diffs)

trunk/expressoMail1_2/js/draw_api.js

@@ -4242 +4242 @@
         }).find('[name="files[]"]').css({"height" : "20px", "width": "100px", "border-width": "0 0 0px 0px", "-moz-transform" : "none","-o-transform" : 'none'});
 
+                
        fileUploadMSG.find("span.message-attach-link").click(function(event){
                 jQuery('#message-attach-dialog').html(DataLayer.render("../prototype/modules/attach_message/attach_message.ejs", {}));
+                $( "#mailpreview_container span.ui-icon-close" ).click();
                 jQuery('#message-attach-dialog').dialog({
                         width:920,
@@ -4250 +4252 @@
                         modal: true,
                         closeOnEscape:true,
-                        close:function(event, ui) {event.stopPropagation();},
+                        close:function(event, ui) {event.stopPropagation(); },
                         autoOpen:false
                 });
+                
+                
                 jQuery.getScript("../prototype/modules/attach_message/attach_message.js", function(){
                         jQuery('#message-attach-dialog').dialog('open');

trunk/prototype/modules/attach_message/attach_message.ejs

@@ -8 +8 @@
         </div>
         <div id="mailpreview_container">
-                <ul id="mailpreview_tabs">
-                        <li><a href="#mailpreview_tabs_default_empty">Nenhuma aba</a></li>
-                </ul>
-                <div id="mailpreview_tabs_default_empty" class="empty-container"><span class="message" ><%=get_lang('select a message to preview')%></span></div>
+                <ul id="mailpreview_tabs"></ul>
         </div>
         <div id="buttons-container">

trunk/prototype/modules/attach_message/attach_message.js

@@ -522 +522 @@
         add: function( event, ui ) {
                 $mailpreview_tabs.tabs('select', '#' + ui.panel.id);
+        
                 if ($('#mailpreview_tabs_default_empty').length && $mailpreview_tabs.tabs("length") > 1) {      
                         $mailpreview_tabs.tabs('remove', '#mailpreview_tabs_default_empty');
@@ -539 +540 @@
 });
 
+$( "#mailpreview_container span.ui-icon-close" ).unbind("click");
 $( "#mailpreview_container span.ui-icon-close" ).live( "click", function(e) {
         var index = $("li", $mailpreview_tabs).index($(this).parent());
@@ -544 +546 @@
         e.stopImmediatePropagation();
 });
+
+if (!$mailpreview_tabs.tabs("length") && !$('#mailpreview_tabs_default_empty').length) {
+                        /**
+                         * TODO: internacionalizar a string 'Nenhuma aba'
+                         */
+                        $mailpreview_tabs.tabs('add', '#mailpreview_tabs_default_empty', 'Nenhuma aba')
+                        .find('#mailpreview_tabs_default_empty').removeClass('mailpreview-message').addClass('empty-container')
+                        .html('<span class="message">' + get_lang('select a message to preview') + '</span>').end()
+                        .find('.ui-tabs-nav li:first .ui-icon-close').remove();
+}