Changeset 5623

Timestamp:

03/05/12 10:22:22 (11 years ago)

Author:

thiago

Message:

Ticket #2486 - Melhoria no codigo da revisão: 5612

Location:

trunk

Files:

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

trunk/expressoMail1_2/js/draw_api.js

@@ -343 +343 @@
         else
                 var myLabels = $("#MyMarckersList");
-                
         myLabels.html("<div class='my-labels'>" +
                                 "<img src='../prototype/modules/mail/img/tag.png'/>" +
@@ -353 +352 @@
         .append(DataLayer.render("../prototype/modules/mail/templates/label_list.ejs", {labels: labels} ))
         .find("li.label-item").css({"background-color":"#ffffff", "border-color":"#CCCCCC", "color":"#444444"}).click(function(event,ui){
-                if($(event.target).is('.square-color') == false){
-                        var labelId = $(this).attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1];
-                        search_emails("UNDELETED KEYWORD \"$Label"+labelId+"\"");
-                }
-        }).end()
-        .find(".square-color").css("display","").click(function(){
-                $(this).parent(".label-item").each(function(){
-                        configureLabels({selectedItem: $(this).attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1]});
-                        var id_label_item = $(this).attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1];
-                        $(".label-list-container .label-list").find(".label-item-"+id_label_item).trigger("click");
-                });
+                if($(event.target).is('.square-color')){
+                                $(this).each(function(){
+                                        configureLabels({selectedItem: $(this).attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1]});
+                                        var id_label_item = $(this).attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1];
+                                        $(".label-list-container .label-list").find(".label-item-"+id_label_item).trigger("click");
+                                });
+                } else {
+                                var labelId = $(this).attr('class').match(/label-item-([\d]+[()a-zA-Z]*)/)[1];
+                                search_emails("UNDELETED KEYWORD \"$Label"+labelId+"\"");
+                }
         });
         

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

@@ -11 +11 @@
                                 <input type="hidden" value="<%= data.labels[i].id%>" name="labelItemId" class="id-item-list" />
                                 
-                                <div class="square-color" style="display:none;width:17px;height:12px;margin-top:1px;-moz-border-radius:3px;-webkit-border-radius:3px;
+                                <div class="square-color" style="width:17px;height:12px;margin-top:1px;-moz-border-radius:3px;-webkit-border-radius:3px;
                                                 background: <%= (data.labels[i].backgroundColor) ? data.labels[i].backgroundColor : '#ffffff' %>; float:right;"></div>