File roundcubemail-1.1-appjs.patch of Package roundcubemail

File roundcubemail-1.1-appjs.patch of Package roundcubemail (Revision 49)

Currently displaying revision 49 , Show latest

diff -ur roundcubemail-1.1-2-assets/program/js/app.js roundcubemail-1.1/program/js/app.js
--- roundcubemail-1.1-2-assets/program/js/app.js	2014-10-13 10:04:50.996719819 +0200
+++ roundcubemail-1.1/program/js/app.js	2014-10-13 10:09:02.723630175 +0200
@@ -58,7 +58,6 @@
     request_timeout: 180,  // seconds
     draft_autosave: 0,     // seconds
     comm_path: './',
-    blankpage: 'program/resources/blank.gif',
     recipients_separator: ',',
     recipients_delimiter: ', ',
     popup_width: 1150,
@@ -163,6 +162,9 @@
       return;
     }
 
+    if (!this.env.blankpage)
+      this.env.blankpage = (this.env.assets_path ? this.env.assets_path : '') + 'program/resources/blank.gif';
+
     // find all registered gui containers
     for (n in this.gui_containers)
       this.gui_containers[n] = $('#'+this.gui_containers[n]);
@@ -7972,7 +7974,7 @@
 
     img.onload = function() { ref.env.browser_capabilities.tif = 1; };
     img.onerror = function() { ref.env.browser_capabilities.tif = 0; };
-    img.src = 'program/resources/blank.tif';
+    img.src = (this.env.assets_path ? this.env.assets_path : '') + 'program/resources/blank.tif';
   };
 
   this.pdf_support_check = function()
diff -ur roundcubemail-1.1-2-assets/program/steps/mail/show.inc roundcubemail-1.1/program/steps/mail/show.inc
--- roundcubemail-1.1-2-assets/program/steps/mail/show.inc	2014-09-23 17:39:14.000000000 +0200
+++ roundcubemail-1.1/program/steps/mail/show.inc	2014-10-13 10:51:05.896904043 +0200
@@ -352,10 +352,10 @@
             '_alt'    => $placeholder,
         ));
 
-        $attrib['onerror'] = "this.src = '" . ($placeholder ? $placeholder : 'program/resources/blank.gif') . "'";
+        $attrib['onerror'] = "this.src = '" . $RCMAIL->output->asset_url(($placeholder ? $placeholder : 'program/resources/blank.gif')) . "'";
     }
     else {
-        $photo_img = $placeholder ? $placeholder : 'program/resources/blank.gif';
+        $photo_img = ($placeholder ? $placeholder : $RCMAIL->output->asset_url('program/resources/blank.gif'));
     }
 
     return html::img(array('src' => $photo_img, 'alt' => $RCMAIL->gettext('contactphoto')) + $attrib);