summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--program/include/rcmail_template.inc6
-rw-r--r--program/js/app.js1
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 39f505028..f227acbc3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,9 @@
CHANGELOG RoundCube Webmail
---------------------------
-2007/09/18 (thomasb)
+2007/09/19 (thomasb)
----------
+- Unlock interface when message sending fails (#1484570)
- Eval PHP code in template includes (if configured)
- Show message when folder is empty. Mo more static text in table (#1484395)
- Only display unread count in page title when new messages arrived
diff --git a/program/include/rcmail_template.inc b/program/include/rcmail_template.inc
index 734032e9e..15752f8bc 100644
--- a/program/include/rcmail_template.inc
+++ b/program/include/rcmail_template.inc
@@ -242,6 +242,10 @@ class rcmail_template extends rcube_html_page
*/
function write($template='')
{
+ // unlock interface after iframe load
+ if ($this->framed)
+ array_unshift($this->js_commands, array('set_busy', false));
+
// write all env variables to client
$js = $this->framed ? "if(window.parent) {\n" : '';
$js .= $this->get_js_commands() . ($this->framed ? ' }' : '');
@@ -305,7 +309,7 @@ class rcmail_template extends rcube_html_page
function get_js_commands()
{
$out = '';
- if (!$this->framed)
+ if (!$this->framed && !empty($this->js_env))
$out .= ($this->ajax_call ? 'this' : JS_OBJECT_NAME) . '.set_env('.json_serialize($this->js_env).");\n";
foreach ($this->js_commands as $i => $args)
diff --git a/program/js/app.js b/program/js/app.js
index 9693ff53d..1711ab592 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -804,6 +804,7 @@ function rcube_webmail()
this.set_busy(true, 'savingmessage');
var form = this.gui_objects.messageform;
form.target = "savetarget";
+ form._draft.value = '1';
form.submit();
break;