Changeset 7745

Timestamp:

01/14/13 14:17:38 (11 years ago)

Author:

gustavo

Message:

Ticket #3285 - Problema com os botoes da arvore de pastas e o Ticket #3286

Location:

trunk

Files:

• expressoMail1_2/js/abas.js (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)
• expressoMail1_2/js/main.js (modified) (1 diff)
• prototype/modules/mail/js/foldertree.js (modified) (3 diffs)

trunk/expressoMail1_2/js/abas.js

@@ -296 +296 @@
                                                                                 
                                                                         }
+                                                        $("#content_folders").stop().scrollTo($(this), {axis:'y', margin:true, offset:-50, duration:400});
                                                 },
                                                 out : function(){

trunk/expressoMail1_2/js/draw_api.js

@@ -1657 +1657 @@
                                                                                         
                                                                                 }
+                                $("#content_folders").stop().scrollTo($(this), {axis:'y', margin:true, offset:-50, duration:400});
                                                         },
                                                         out : function(){

trunk/expressoMail1_2/js/main.js

@@ -813 +813 @@
                                                                                                         
                                                                                                 }
+                                                                                $("#content_folders").stop().scrollTo($(this), {axis:'y', margin:true, offset:-50, duration:400});
                                                                         },
                                                                         out : function(){

trunk/prototype/modules/mail/js/foldertree.js

@@ -240 +240 @@
     
     folders_html.find('[id="'+selected+'"]').children().addClass("selected");
-    $(".folder").not(".head_folder").not(".shared-folders").parent().find(".folder").not(".head_folder,.inbox,.drafts,.sent,.spam,.trash").draggable({
+    $(".folder").not(".head_folder").not(".shared-folders").not(".shared-folders + ul .folder").parent().find(".folder").not(".head_folder,.inbox,.drafts,.sent,.spam,.trash").draggable({
         // DRAG DE PASTAS
         start : function(){
@@ -255 +255 @@
         },
         delay: 150,
-        appendTo: $("#content_folders"),
         refreshPositions: true,
-        iframeFix: true
-        //zIndex : 2700,
+        zIndex : 2700,
         //scroll: true,
         //scrollSensitivity: 100,
         //scrollSpeed: 100
-        //containment: $("#content_folders")
-    }).end().droppable({
+        containment: $("#divAppbox")
+    });
+    $(".folder").not(".head_folder").not(".shared-folders").parent().find(".folder").not(".head_folder,.inbox,.drafts,.sent,.spam,.trash").end().droppable({
         //DROP DE PASTAS
         over : function(a, b){
@@ -388 +387 @@
         }
     });
-    $(".folder").not(".shared-folders").parent().find(".folder").hover(
+    $(".folder").not(".shared-folders, .followup-messages").parent().find(".folder").hover(
         function(){
             //CASO A LI NÃO TENHA UM eventNU FLUTUANTE AINDA, O eventNU É ADICIONADO!