From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sun, 11 Oct 2009 22:06:36 +0000 (-0600)
Subject: Show loading text before iframe content is injected
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=9fe0de0758985ef0744a0f1f4ef0d08e70df6fbf;p=horde.git

Show loading text before iframe content is injected
---

diff --git a/imp/js/imp.js b/imp/js/imp.js
index c0fa9351a..8456e2887 100644
--- a/imp/js/imp.js
+++ b/imp/js/imp.js
@@ -93,6 +93,7 @@ document.observe('dom:loaded', function() {
         d.write(data);
         d.close();
 
+        id.show().previous().remove();
         this.iframeResize(id);
     };
 
diff --git a/imp/lib/Mime/Viewer/Html.php b/imp/lib/Mime/Viewer/Html.php
index a81d8367a..ad55a9cbd 100644
--- a/imp/lib/Mime/Viewer/Html.php
+++ b/imp/lib/Mime/Viewer/Html.php
@@ -118,7 +118,7 @@ class IMP_Horde_Mime_Viewer_Html extends Horde_Mime_Viewer_Html
         $uid = 'htmldata_' . uniqid(mt_rand());
 
         $data['js'] = array('IMP.iframeInject("' . $uid . '", ' . Horde_Serialize::serialize($data['data'], Horde_Serialize::JSON, $this->_mimepart->getCharset()) . ')');
-        $data['data'] = '<IFRAME class="htmlMsgData" id="' . $uid . '" src="javascript:false" frameborder="0"></IFRAME>' .
+        $data['data'] = '<DIV>' . _("Loading...") . '</DIV><IFRAME class="htmlMsgData" id="' . $uid . '" src="javascript:false" frameborder="0" style="display:none"></IFRAME>' .
             Horde_Util::bufferOutput(array('Horde', 'addScriptFile'), 'imp.js', 'imp');
         $data['type'] = 'text/html; charset=UTF-8';