Changeset 6013 in subversion

Timestamp:

Mar 15, 2012 2:49:24 PM (14 months ago)

Author:

alec

Message:

• Merge r6012 from trunk

Location:

branches/release-0.7

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_template.php (modified) (1 diff)
• program/js/app.js (modified) (1 diff)

branches/release-0.7/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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
 - Fix counting of messages search results (on refresh when search filter is in use)

branches/release-0.7/program/include/rcube_template.php

@@ -917 +917 @@
             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)) {

branches/release-0.7/program/js/app.js

@@ -172 +172 @@
 
     // enable general commands
-    this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', true);
+    this.enable_command('logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'switch-task', true);
 
     if (this.env.permaurl)