diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-03-15 18:33:17 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-03-15 18:33:17 +0000 |
| commit | d32ed7eee5fd3165b52f6cb0604b8f42b806d482 (patch) | |
| tree | 7c46e59c3db79d0eaa6b2087636967e15d3ad409 /roundcubemail | |
| parent | fc725478fabb637f2edd3be3df04ecd9400a1d1d (diff) | |
- Fix lack of warning when switching task in compose window (#1488399)
git-svn-id: https://svn.roundcube.net/trunk@6012 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_template.php | 2 | ||||
| -rw-r--r-- | roundcubemail/program/js/app.js | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index f8578160f..ae8bee852 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix lack of warning when switching task in compose window (#1488399) - Fix bug where it wasn't possible to enter ( or & characters in autocomplete fields - Request all needed fields from address book backends (#1488394) - Unified (single) spellchecker button diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php index 94fa6763c..bec84c97a 100644 --- a/roundcubemail/program/include/rcube_template.php +++ b/roundcubemail/program/include/rcube_template.php @@ -936,7 +936,7 @@ class rcube_template extends rcube_html_page // make valid href to specific buttons if (in_array($attrib['command'], rcmail::$main_tasks)) { $attrib['href'] = rcmail_url(null, null, $attrib['command']); - $attrib['onclick'] = sprintf("%s.switch_task('%s');return false", JS_OBJECT_NAME, $attrib['command']); + $attrib['onclick'] = sprintf("%s.command('switch-task','%s');return false", JS_OBJECT_NAME, $attrib['command']); } else if ($attrib['task'] && in_array($attrib['task'], rcmail::$main_tasks)) { $attrib['href'] = rcmail_url($attrib['command'], null, $attrib['task']); diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index 40cca700e..b2cb1c0c1 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/program/js/app.js @@ -175,7 +175,7 @@ function rcube_webmail() } // enable general commands - this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', true); + this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', 'switch-task', true); if (this.env.permaurl) this.enable_command('permaurl', true); |