diff options
Diffstat (limited to 'js/gui/KeyboardShortcuts.js')
-rw-r--r-- | js/gui/KeyboardShortcuts.js | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/js/gui/KeyboardShortcuts.js b/js/gui/KeyboardShortcuts.js index d103ed51a..2b8974d26 100644 --- a/js/gui/KeyboardShortcuts.js +++ b/js/gui/KeyboardShortcuts.js @@ -256,23 +256,15 @@ }); }; - var scrollToItem = function (scrollArea, item, isCompactMode) { + var scrollToItem = function (scrollArea, item) { // if you go to the next article in compact view, it should // expand the current one scrollArea.scrollTop( item.offset().top - scrollArea.offset().top + scrollArea.scrollTop() ); - - if (isCompactMode) { - onActiveItem(scrollArea, function (item) { - if (!item.hasClass('open')) { - item.find('.utils').trigger('click'); - } - }); - } }; - var scrollToNextItem = function (scrollArea, isCompactMode) { + var scrollToNextItem = function (scrollArea) { var items = scrollArea.find('.item'); var jumped = false; @@ -280,7 +272,7 @@ item = $(item); if (item.position().top > 1) { - scrollToItem(scrollArea, item, isCompactMode); + scrollToItem(scrollArea, item); jumped = true; @@ -295,7 +287,7 @@ }; - var scrollToPreviousItem = function (scrollArea, isCompactMode) { + var scrollToPreviousItem = function (scrollArea) { var items = scrollArea.find('.item'); var jumped = false; @@ -307,7 +299,7 @@ // if there are no items before the current one if (previous.length > 0) { - scrollToItem(scrollArea, previous, isCompactMode); + scrollToItem(scrollArea, previous); } jumped = true; @@ -329,19 +321,18 @@ var keyCode = event.keyCode; var scrollArea = $('#app-content'); var navigationArea = $('#app-navigation'); - var isCompactMode = $('#app-content-wrapper > .compact').length > 0; // j, n, right arrow if ([74, 78, 39].indexOf(keyCode) >= 0) { event.preventDefault(); - scrollToNextItem(scrollArea, isCompactMode); + scrollToNextItem(scrollArea); // k, p, left arrow } else if ([75, 80, 37].indexOf(keyCode) >= 0) { event.preventDefault(); - scrollToPreviousItem(scrollArea, isCompactMode); + scrollToPreviousItem(scrollArea); // u } else if ([85].indexOf(keyCode) >= 0) { |