summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorMatthias Blümel <user@inanna.local>2013-12-10 00:24:13 +0100
committerMatthias Blümel <user@inanna.local>2013-12-10 00:24:13 +0100
commit85f54470eae162ac178cea09b4aba9d702ff709d (patch)
tree1c6ff50f4103bb298e883891c6620254e8f9d0c8 /js
parentc12ef0e916963484510afd1be7c6b5c64d500ff8 (diff)
Issue #420
Diffstat (limited to 'js')
-rw-r--r--js/app/directives/itemshortcuts.coffee8
-rw-r--r--js/public/app.js6
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);
}
}