plugins/kolab_shortcuts

Aleksander Machniak machniak at kolabsys.com
Thu Feb 19 09:41:49 CET 2015


 plugins/kolab_shortcuts/kolab_shortcuts.js |   26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 12b7bd885625199639975afbb8c2c2af5fa350a9
Author: Aleksander Machniak <alec at alec.pl>
Date:   Thu Feb 19 09:41:23 2015 +0100

    Correctly implement thread expand and collapse shortcuts

diff --git a/plugins/kolab_shortcuts/kolab_shortcuts.js b/plugins/kolab_shortcuts/kolab_shortcuts.js
index 7f624c3..4111fa7 100644
--- a/plugins/kolab_shortcuts/kolab_shortcuts.js
+++ b/plugins/kolab_shortcuts/kolab_shortcuts.js
@@ -54,8 +54,7 @@ var kolab_shortcuts = {
         ctrl: true,
         active: function(e) { return rcmail.task == 'mail'; },
         action: function(e) {
-            var action = $('.collapsed:first', rcmail.gui_objects.messagelist).length ? 'expand' : 'collapse';
-            return rcmail.command(action + '-all', '', e.target, e);
+            return rcmail.command('expand-all', '', e.target, e);
         }
     },
     'mail.expand-thread': {
@@ -64,9 +63,28 @@ var kolab_shortcuts = {
         action: function(e) {
             if (rcmail.message_list) {
                 var row, uid = rcmail.message_list.get_single_selection();
-                console.log(uid);
                 if (uid && (row = rcmail.message_list.rows[uid])) {
-                    rcmail.message_list[row.expanded ? 'collapse_all' : 'expand_all'](row);
+                    rcmail.message_list.expand_all(row);
+                }
+            }
+        }
+    },
+    'mail.collapse-all-threads': {
+        key: 44, // Ctrl+,
+        ctrl: true,
+        active: function(e) { return rcmail.task == 'mail'; },
+        action: function(e) {
+            return rcmail.command('collapse-all', '', e.target, e);
+        }
+    },
+    'mail.collapse-thread': {
+        key: 44, // ,
+        active: function(e) { return rcmail.task == 'mail'; },
+        action: function(e) {
+            if (rcmail.message_list) {
+                var row, uid = rcmail.message_list.get_single_selection();
+                if (uid && (row = rcmail.message_list.rows[uid])) {
+                    rcmail.message_list.collapse_all(row);
                 }
             }
         }




More information about the commits mailing list