diff options
author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2013-12-09 15:44:13 -0800 |
---|---|---|
committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2013-12-09 15:44:13 -0800 |
commit | 17f66d9f6a1dd9141c3ea350b8c054a9b1fb426f (patch) | |
tree | b3ae61cd512b9ce2419febb508e3e99f16d21d03 | |
parent | e8e2ee4a5d824dda0470a9f4db2b39547c12bb9c (diff) | |
parent | 85f54470eae162ac178cea09b4aba9d702ff709d (diff) |
Merge pull request #424 from Blaimi/master
Issue #420
-rw-r--r-- | js/app/directives/itemshortcuts.coffee | 8 | ||||
-rw-r--r-- | js/public/app.js | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/js/app/directives/itemshortcuts.coffee b/js/app/directives/itemshortcuts.coffee index 728c52392..367086fbb 100644 --- a/js/app/directives/itemshortcuts.coffee +++ b/js/app/directives/itemshortcuts.coffee @@ -105,28 +105,34 @@ angular.module('News').directive 'itemShortcuts', ['$window', ($window) -> scrollArea = elm # j or right or n if e.keyCode == 74 or e.keyCode == 39 or e.keyCode == 78 + e.preventDefault() jumpToNextItem(scrollArea) # k or left or p else if e.keyCode == 75 or e.keyCode == 37 or e.keyCode == 80 + e.preventDefault() jumpToPreviousItem(scrollArea) # u else if e.keyCode == 85 + e.preventDefault() keepUnreadCurrentItem(scrollArea) # s or i or l else if e.keyCode == 73 or e.keyCode == 83 or e.keyCode == 76 + e.preventDefault() starCurrentItem(scrollArea) # h else if e.keyCode == 72 + e.preventDefault() starCurrentItem(scrollArea) jumpToNextItem(scrollArea) # o else if e.keyCode == 79 + e.preventDefault() openCurrentItem(scrollArea) -]
\ No newline at end of file +] diff --git a/js/public/app.js b/js/public/app.js index 87ea8c288..db3ccd5c7 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -275,17 +275,23 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. if (!(focused.is('input') || focused.is('select') || focused.is('textarea') || focused.is('checkbox') || focused.is('button'))) { scrollArea = elm; if (e.keyCode === 74 || e.keyCode === 39 || e.keyCode === 78) { + e.preventDefault(); return jumpToNextItem(scrollArea); } else if (e.keyCode === 75 || e.keyCode === 37 || e.keyCode === 80) { + e.preventDefault(); return jumpToPreviousItem(scrollArea); } else if (e.keyCode === 85) { + e.preventDefault(); return keepUnreadCurrentItem(scrollArea); } else if (e.keyCode === 73 || e.keyCode === 83 || e.keyCode === 76) { + e.preventDefault(); return starCurrentItem(scrollArea); } else if (e.keyCode === 72) { + e.preventDefault(); starCurrentItem(scrollArea); return jumpToNextItem(scrollArea); } else if (e.keyCode === 79) { + e.preventDefault(); return openCurrentItem(scrollArea); } } |