From 85f54470eae162ac178cea09b4aba9d702ff709d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bl=C3=BCmel?= <user@inanna.local>
Date: Tue, 10 Dec 2013 00:24:13 +0100
Subject: Issue #420

---
 js/app/directives/itemshortcuts.coffee | 8 +++++++-
 js/public/app.js                       | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'js')

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);
             }
           }
-- 
cgit v1.2.3