Changeset 7273 for sandbox/2.4.3-expresso-rest/expressoMail1_2/js/draw_api.js

Timestamp:

09/21/12 16:02:43 (12 years ago)

Author:

alexandrecorreia

Message:

Ticket #3093 - Merge do trunk( expresso 2.4 ) para o sandbox( expresso 2.4.3)

Location:

sandbox/2.4.3-expresso-rest

Files:

• . (modified) (1 prop)
• expressoMail1_2/js/draw_api.js (modified) (5 diffs)

sandbox/2.4.3-expresso-rest/expressoMail1_2/js/draw_api.js

@@ -1322 +1322 @@
                 td_element3 = createTDElement(0,8,"th_resizable","left","message_header_SORTFROM_"+numBox);
                 td_element3.onclick = function () {sort_box(search_box_type,'SORTFROM');};
-                td_element3.innerHTML = get_lang("From");
+                folder_ = special_folders['Sent'];
+                current_ = get_current_folder();
+                if ((preferences.from_to_sent == "1") && (current_.substr(current_.length - folder_.length, folder_.length) == folder_)) {
+                td_element3.innerHTML = get_lang("To");
+        }else{
+                        td_element3.innerHTML = get_lang("From");
+        }
 
                 td_element4 = createTDElement(0,9,"th_resizable","left","message_header_SORTSUBJECT_"+numBox);
@@ -2170 +2176 @@
         if ((preferences.from_to_sent == "1") && (current.substr(current.length - folder.length, folder.length) == folder)) {
         document.getElementById("message_header_SORTFROM_"+numBox).innerHTML    = get_lang("To");
+        if (sort_box_type == "SORTFROM")
+                type_name = get_lang("To");
     }else{
         document.getElementById("message_header_SORTFROM_"+numBox).innerHTML    = get_lang("From");
@@ -4138 +4146 @@
                                                         'auto_close': 3000
                                                 });
-                                        }).find(".box-input").val("\""+data.collection.data[1].value+"\" <"+data.collection.data[2].value+">");
+                                        }).find(".box-input").val("\""+data.collection.data[1].value+"\" <"+$.trim(data.collection.data[2].value)+">");
                                         box.find(".email-box-value").html( (data.collection.data[1].value.length > 18 ? data.collection.data[1].value.substring(0, 15)+"...": data.collection.data[1].value))
                                 }
@@ -4165 +4173 @@
                                                         'auto_close': 3000
                                                 });
-                                        }).find(".box-input").val("\""+item.name+"\" <"+item.email+">");
+                                        }).find(".box-input").val("\""+item.name+"\" <"+$.trim(item.email)+">");
 
                                         box.find(".email-box-value").html(normalizeBoxName(item.name, item.value));
@@ -4192 +4200 @@
                                                 'auto_close': 3000
                                         });
-                                }).find(".box-input").val("\""+item.name+"\" <"+item.email+">");
+                                }).find(".box-input").val("\""+item.name+"\" <"+$.trim(item.email)+">");
 
                 box.find(".email-box-value").html(normalizeBoxName(item.name, item.value));