Unlock interface when message sending fails (#1484570)

release-0.6
thomascube 17 years ago
parent 5eee009671
commit 4d0413dd89

@ -1,8 +1,9 @@
CHANGELOG RoundCube Webmail 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) - Eval PHP code in template includes (if configured)
- Show message when folder is empty. Mo more static text in table (#1484395) - Show message when folder is empty. Mo more static text in table (#1484395)
- Only display unread count in page title when new messages arrived - Only display unread count in page title when new messages arrived

@ -242,6 +242,10 @@ class rcmail_template extends rcube_html_page
*/ */
function write($template='') 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 // write all env variables to client
$js = $this->framed ? "if(window.parent) {\n" : ''; $js = $this->framed ? "if(window.parent) {\n" : '';
$js .= $this->get_js_commands() . ($this->framed ? ' }' : ''); $js .= $this->get_js_commands() . ($this->framed ? ' }' : '');
@ -305,7 +309,7 @@ class rcmail_template extends rcube_html_page
function get_js_commands() function get_js_commands()
{ {
$out = ''; $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"; $out .= ($this->ajax_call ? 'this' : JS_OBJECT_NAME) . '.set_env('.json_serialize($this->js_env).");\n";
foreach ($this->js_commands as $i => $args) foreach ($this->js_commands as $i => $args)

@ -804,6 +804,7 @@ function rcube_webmail()
this.set_busy(true, 'savingmessage'); this.set_busy(true, 'savingmessage');
var form = this.gui_objects.messageform; var form = this.gui_objects.messageform;
form.target = "savetarget"; form.target = "savetarget";
form._draft.value = '1';
form.submit(); form.submit();
break; break;

Loading…
Cancel
Save