Changeset 1339

Timestamp:

08/19/09 08:36:56 (15 years ago)

Author:

amuller

Message:

Ticket #605 - reverte modificação que criou problema na busca

File:

• trunk/expressoMail1_2/js/search.js (modified) (16 diffs)

trunk/expressoMail1_2/js/search.js

@@ -334 +334 @@
                                 aux[0] = nw_array[i].substr(0, nw_array[i].indexOf('--'));
                                 nw_array[i] = nw_array[i].substr(nw_array[i].indexOf('--')+2);
-                                aux[3] = nw_array[i].substr(0, nw_array[i].indexOf('--'));
-                                nw_array[i] = nw_array[i].substr(nw_array[i].indexOf('--')+2);
                                 aux[1] = nw_array[i].substr(0, nw_array[i].indexOf('--'));
                                 aux[2] = nw_array[i].substr(nw_array[i].indexOf('--')+2);
@@ -343 +341 @@
                         {
                                 var aux = nw_array[i].split("--");
-                                aux.splice(4,0,aux[1]);
-                                var mailbox = aux.shift();
-                                aux.splice(0,1,mailbox);
-                        }
-                        
-                        var mailbox_name = aux[0];
-                        var mailbox_id = aux[3];
-                        var uid_msg = aux[7];
+                        }
+
+                        var mailbox = aux[0];
+                        var uid_msg = aux[6];
                         var subject = aux[2];
                         tr.id = uid_msg;
-                        tr.setAttribute('name',mailbox_id);
-                        if (aux[6].match("U"))
+
+                        // Keep the two lines together please
+                        tr.setAttribute('name',mailbox);
+                        tr.name = mailbox;
+
+                        if (aux[5].match("U"))
                                 add_className(tr,'tr_msg_unread');
                         add_className(tr, i%2 != 0 ? 'tr_msg_read2' : 'tr_msg_read');
@@ -370 +368 @@
                                 {
                                         td.style.width = "2%";
-                                        if (aux[6].match('T'))
+                                        if (aux[5].match('T'))
                                         {
-                                                attachNum = parseInt(aux[6].substr(aux[6].indexOf('T')+1));
+                                                attachNum = parseInt(aux[5].substr(aux[5].indexOf('T')+1));
                                                 td1 = "<img src='templates/"+template+"/images/clip.gif' title='"+attachNum +' '+ get_lang('attachment(s)')+"'>";
                                         }
@@ -382 +380 @@
                                         td.style.width = "1%";
                                         td.id = "td_message_answered_"+uid_msg;
-                                        if (aux[6].match('X'))
+                                        if (aux[5].match('X'))
                                                 td1 = '<img src=templates/'+template+'/images/forwarded.gif title=Forwarded>';
                                         else
-                                                if (aux[6].match('A'))
+                                                if (aux[5].match('A'))
                                                         td1 = '<img src=templates/'+template+'/images/answered.gif>';
                                                 else
@@ -394 +392 @@
                                         td.style.width = "1%";
                                         td.id = "td_message_important_"+uid_msg;
-                                        if (aux[6].match("F"))
+                                        if (aux[5].match("F"))
                                         {
                                                 add_className(tr, 'flagged_msg');
@@ -410 +408 @@
                                 if (j == 5)
                                 {
-                                        td.style.width = "20%";
+                                        td.style.width = "14%";
                                         td.onclick = _onclick;
                                         var nm_box = aux[0].split(cyrus_delimiter);
@@ -418 +416 @@
                                         td.style.color = "#42795b";
                                         td.style.fontWeight = "bold";
-                                        if(proxy_mensagens.is_local_folder(td1)) {
-                                                var td1 = this.aux_local_folder_display(td1);
-                                                aux[2] = tr.name = aux[0]; // precisa trocar pelo nome real no banco do gears.
-                                        } else {
-                                                if(td1 == "INBOX"){
-                                                        var td1  = get_lang("Inbox");
-                                                } 
-                                                else if (nm_box[0] == 'user') 
-                                                        if (nm_box.length > 1) 
-                                                                var td1 = nm_box[1] + '/' + lang_folder(td1);
-                                                        else 
-                                                                var td1 = td1;
-                                                else 
-                                                        var td1 = lang_folder(td1);
+
+                                        if(td1 == "INBOX"){
+                                                var td1  = get_lang("Inbox");
                                         }
 
@@ -440 +427 @@
                                 if( j == 6)
                                 {
-                                        if (aux[2].length > 29)
-                                                aux[2] = aux[2].substr(0,29) + "...";
+                                        if (aux[1].length > 29)
+                                                aux[1] = aux[1].substr(0,29) + "...";
                                         td.style.width = "20%";
                                         td.onclick = _onclick;
@@ -453 +440 @@
                                         if (! subject_encode)
                                                 aux[2] = get_lang("no subject") + "...";
-                                        if (aux[2] > 70)
+                                        if (aux[2].length > 70)
                                                 aux[2] = aux[2].substr(0,70) + "...";
                                         td.style.width = "35%";
@@ -459 +446 @@
                                         td.setAttribute("NoWrap","true");
                                         td.style.overflow = "hidden";
-                                        var td1  = subject;
+                                        var td1  = aux[2];
 
                                 }
@@ -467 +454 @@
                                         td.align = "center";
                                         td.onclick = _onclick;
-                                        var td1  = aux[4];
+                                        var td1  = aux[3];
                                 }
                                 if( j == 9)
@@ -474 +461 @@
                                         td.align = "center";
                                         td.onclick = _onclick;
-                                        var td1  = aux[5];
+                                        var td1  = aux[4];
                                 }
                                 if (j == 10)
                                 {
-                                        if (aux[6].match("U"))
+                                        if (aux[5].match("U"))
                                                 add_className(tr, 'tr_msg_unread');
-                                        if (aux[7].match("F"))
+                                        if (aux[5].match("F"))
                                                 add_className(tr, 'flagged_msg');
                                         var td1 = '';
@@ -489 +476 @@
                         aux.splice(0,(aux.length));
 
-                _dragArea.makeDragged(tr, uid_msg, subject, true, mailbox_id);
+                _dragArea.makeDragged(tr, uid_msg, subject, true, mailbox);
                 tbody.appendChild(tr);
                 }
@@ -524 +511 @@
                 tr_element.className = "message_header";
                 td_element0 = document.createElement("TD");
-                td_element0.setAttribute("width", "6%");
+                td_element0.setAttribute("width", "1%");
                 chk_box_element = document.createElement("INPUT");
                 chk_box_element.id  = "chk_box_select_all_messages";
@@ -658 +645 @@
         }
 
-        searchE.prototype.open_msg = function(mailbox_id, uid_msg, subject){
+        searchE.prototype.open_msg = function(mailbox, uid_msg, subject){
                 var handler_get_msg = function(data){
                         if(Element("border_id_" + uid_msg + "_r")){alert(get_lang("This message is already opened!"));}
@@ -664 +651 @@
                         //set_msg_as_read(msgs_to_set[i], false);
                 }
-                proxy_mensagens.get_msg(uid_msg,mailbox_id,false,handler_get_msg);
+                proxy_mensagens.get_msg(uid_msg,mailbox,false,handler_get_msg);
                 /*var args   = "$this.imap_functions.get_info_msg";
                 var params = "msg_number=" + uid_msg + "&msg_folder=" + mailbox;