Changeset 4410 for branches/2.2.0.1

Timestamp:

05/13/11 12:04:58 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1875 - Assunto não acompanha redimensionamento da coluna

File:

• branches/2.2.0.1/expressoMail1_2/js/draw_api.js (modified) (5 diffs)

branches/2.2.0.1/expressoMail1_2/js/draw_api.js

@@ -657 +657 @@
         if (tbl.emptyBody)
                 return;
-        if ((((cellWidth-cellMouseX)<15)||((el.style.cursor=="e-resize")&&(detectLeftButton())))&&((el.className=="th_resizable")&&(el.cellIndex+1<el.parentNode.cells.length))){
-                if (tbl) tbl.style.cursor = "e-resize";
-                el.style.cursor ="e-resize";
+        if ((((cellWidth-cellMouseX)<15)||((el.style.cursor=="col-resize")&&(detectLeftButton())))&&((el.className=="th_resizable")&&(el.cellIndex+1<el.parentNode.cells.length))){
+                if (tbl) tbl.style.cursor = "col-resize";
+                el.style.cursor ="col-resize";
         }
         else{
@@ -685 +685 @@
         if (document.getElementById("table_message_header_box_"+numBox).emptyBody)
                 return;
-        if (objCell.style.cursor == "e-resize" && detectLeftButton(ev)) {
+        if (objCell.style.cursor == "col-resize" && detectLeftButton(ev)) {
                 var cellIndex = objCell.cellIndex;
                 var adjIndex = adjCell.cellIndex;
@@ -738 +738 @@
         if (document.getElementById("table_message_header_box_"+numBox).emptyBody)
                 return;
-        if (el.style.cursor == "e-resize" && detectLeftButton(ev)) {
+        if (el.style.cursor == "col-resize" && detectLeftButton(ev)) {
                 var incIndex = ( (el.parentNode.cells.length > el.cellIndex + 1) ? 1 : -1 );
                 var msgTable = getMessagesTable(el);
@@ -1258 +1258 @@
                 if(headers_msgs.msg_sample && preferences.preview_msg_subject == "1")
                 {
-                        tr_element.msg_sample = headers_msgs.msg_sample.body.substr(0,120) + "..."; //trecho do body que sera exibido com o assunto;
+                        if (cssForResizing) //Colunas redimensionaveis - nao trunca
+                                tr_element.msg_sample = headers_msgs.msg_sample.body.substr(0,180) + "..."; //trecho do body que sera exibido com o assunto;
+                        else
+                                tr_element.msg_sample = headers_msgs.msg_sample.body.substr(0,120) + "..."; //trecho do body que sera exibido com o assunto;
                 }
 
@@ -1426 +1429 @@
                 if ((headers_msgs.subject)&&(headers_msgs.subject.length > 50))
                 {
-                        //Modificacao para evitar que o truncamento do assunto quebre uma NCR - #1189
-                        pos = headers_msgs.subject.indexOf("&",45);
-                        if ((pos > 0) && (pos <= 50) && ((headers_msgs.subject.charAt(pos+5) == ";") || (headers_msgs.subject.charAt(pos+6) == ";")))
-                                td_element4.innerHTML += headers_msgs.subject.substring(0,pos+6) + "..." + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample +"</span>";
-                        else
-                                td_element4.innerHTML += headers_msgs.subject.substring(0,50) + "..." + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample +"</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem;
+                        if (cssForResizing)
+                                //Colunas redimensionaveis - nao trunca
+                                td_element4.innerHTML += headers_msgs.subject + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample +"</span>";
+                        else {
+                                //Modificacao para evitar que o truncamento do assunto quebre uma NCR - #1189
+                                pos = headers_msgs.subject.indexOf("&",45);
+                                if ((pos > 0) && (pos <= 50) && ((headers_msgs.subject.charAt(pos+5) == ";") || (headers_msgs.subject.charAt(pos+6) == ";")))
+                                        td_element4.innerHTML += headers_msgs.subject.substring(0,pos+6) + "..." + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample +"</span>";
+                                else
+                                        td_element4.innerHTML += headers_msgs.subject.substring(0,50) + "..." + "<span style=\"color:#b3b3b3;\">  " + tr_element.msg_sample +"</span>";//modificacao feita para exibir o trecho do body ao lado do assunto da mensagem;
+                        }
                 }
                 else