From b9ce92d883b30172b6185ac4dd1a922b3c414f0f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 15 Mar 2012 14:33:17 -0400
Subject: [PATCH] - Fix lack of warning when switching task in compose window (#1488399)
---
CHANGELOG | 1 +
program/include/rcube_template.php | 2 +-
program/js/app.js | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f857816..ae8bee8 100644
--- a/CHANGELOG
+++ b/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/program/include/rcube_template.php b/program/include/rcube_template.php
index 94fa676..bec84c9 100644
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -936,7 +936,7 @@
// 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/program/js/app.js b/program/js/app.js
index 40cca70..b2cb1c0 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -175,7 +175,7 @@
}
// 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);
--
Gitblit v1.9.1