Changeset 3355 for branches/2.2

Timestamp:

10/14/10 15:05:59 (14 years ago)

Author:

brunocosta

Message:

Ticket #1302 - na função print_msg foi mudada expressão que monta impressão.

Location:

branches/2.2/expressoMail1_2/js

Files:

• local_messages.js (modified) (1 diff)
• main.js (modified) (1 diff)

branches/2.2/expressoMail1_2/js/local_messages.js

@@ -386 +386 @@
         for (i in anexos)
         {
-            nomeArquivo = anexos[i]['name'].substring(0,anexos[i]['name'].length - 4);
-            if(anexos[i]['name'] && anexos[i]['name'].match(/((jpg)|(jpeg)|(png)|(gif)|(bmp))/gi))
+            if(anexos[i]['url'] && anexos[i]['url'].match(/((jpg)|(jpeg)|(png)|(gif)|(bmp))/gi))
             {
                 var er_imagens = new RegExp("\\.\\/inc\\/show_embedded_attach.php\\?msg_folder=[\\w/]+\\&msg_num=[0-9]+\\&msg_part="+anexos[i]['pid']);

branches/2.2/expressoMail1_2/js/main.js

@@ -2093 +2093 @@
         var body                = Element('body_'+border_ID);
 
-        if (!is_ie) {//altera o link da imagem para renderização na tela de impressão no firefox 
-                var link = location.href.replace(/\/expressoMail1_2\/(.*)/, ""); 
-                link = link.replace(/\/expressoMail1_2\/(.*)/, ""); 
-                body.innerHTML = body.innerHTML.replace(/\.(\/inc\/show_embedded_attach\.php)/, link + "/expressoMail1_2$1"); 
-                body.innerHTML = body.innerHTML.replace(/(tmpLclAtt\/)/, link + "/expressoMail1_2/$1"); 
-        }
-
-
+        if(!is_ie)
+            {
+                var link = location.href.replace(/\/expressoMail1_2\/(.*)/, "");
+                var tab_tags = body.getElementsByTagName("IMG");
+                for(var i = 0; i < tab_tags.length;i++)
+                    {
+                        var _img = document.createElement("IMG");
+                        _img.src = tab_tags[i].src;
+                        if(tab_tags[i].src.toUpperCase().indexOf('/INC/SHOW_EMBEDDED_ATTACH.PHP?MSG_FOLDER=') > -1)
+                            {
+                                _img.src = link + '/expressoMail1_2'+tab_tags[i].src.substr(tab_tags[i].src.toUpperCase().indexOf('/INC/SHOW_EMBEDDED_ATTACH.PHP?MSG_FOLDER='));
+                            }
+                        tab_tags[i].parentNode.replaceChild(_img,tab_tags[i]);
+                    }
+            }
         var print_width = screen.width - 200;
         var x = ((screen.width - print_width) / 2);