diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-20 10:54:57 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-20 10:54:57 +0200 |
commit | 7683efc12dd5fcd3b0c1f9e4f93e2e569b536571 (patch) | |
tree | ee505dbc844e72cea27f1069540831d788922881 /js/gui/KeyboardShortcuts.js | |
parent | 70efb8991f12840e22e4d2c81f3c7c0da97b0ead (diff) |
version bump3.404
Diffstat (limited to 'js/gui/KeyboardShortcuts.js')
-rw-r--r-- | js/gui/KeyboardShortcuts.js | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/js/gui/KeyboardShortcuts.js b/js/gui/KeyboardShortcuts.js index b5a5e4bad..eed59a16d 100644 --- a/js/gui/KeyboardShortcuts.js +++ b/js/gui/KeyboardShortcuts.js @@ -78,18 +78,31 @@ '.starred-feed:visible,' + '.feed:visible'); + // special case: folder selected if (current.hasClass('folder')) { - current = current.prev('.folder'); - while (current.length > 0) { - var subfeeds = current.find('.feed:visible'); + var previousFolder = current.prev('.folder'); + + while (previousFolder.length > 0) { + var subfeeds = previousFolder.find('.feed:visible'); if (subfeeds.length > 0) { $(subfeeds[subfeeds.length-1]) .children('a:visible').trigger('click'); return; } + previousFolder = previousFolder.prev('.folder'); } - // no subfeed found + // no subfeed found try visible feeds + var feeds = current.siblings('.feed'); + + if (feeds.length > 0) { + (feeds[feeds.length-1]) + .children('a:visible').trigger('click'); + return; + } + + + // no feed found, go to starred var starred = $('.starred-feed:visible'); if (starred.length > 0) { starred.children('a:visible').trigger('click'); |