diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-09-19 06:48:18 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-09-19 06:48:18 +0000 |
| commit | 5fc97585f3fad42240b6edbcc77f83d21292d2b3 (patch) | |
| tree | 6d52b7d5a70c2bcdae4c550eb0b69a768ef1513c /roundcubemail/program/include | |
| parent | c9921fca64e04f8fd8de7eeda7fbb6b587d4c34e (diff) | |
Unlock interface when message sending fails (#1484570)
git-svn-id: https://svn.roundcube.net/trunk@802 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include')
| -rw-r--r-- | roundcubemail/program/include/rcmail_template.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcmail_template.inc b/roundcubemail/program/include/rcmail_template.inc index 734032e9e..15752f8bc 100644 --- a/roundcubemail/program/include/rcmail_template.inc +++ b/roundcubemail/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) |