From 19bab14274f516091b1985d44709f0ad678771c9 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 3 Apr 2014 23:59:42 +0200 Subject: Don't prevent shortcuts if a button (starred icon for instance) is focused (theres no input for buttons anyways), fix #497 --- CHANGELOG | 1 + js/app/directives/itemshortcuts.coffee | 3 +-- js/public/app.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3b15e7437..adfc87b79 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,7 @@ owncloud-news (1.808) * Also focus article area when clicking on all unread link * Autofocus article area by default on load * Instantiate only one itemcontroller, prevents tons of requests when autopaging +* Fix bug that would disable keyboard shortcuts after the star icon has been clicked owncloud-news (1.807) * Don't crash if an HttpException occurs in the python updater diff --git a/js/app/directives/itemshortcuts.coffee b/js/app/directives/itemshortcuts.coffee index 49dc75b37..8eec1bf0a 100644 --- a/js/app/directives/itemshortcuts.coffee +++ b/js/app/directives/itemshortcuts.coffee @@ -102,8 +102,7 @@ angular.module('News').directive 'itemShortcuts', ['$window', ($window) -> if not (focused.is('input') or focused.is('select') or focused.is('textarea') or - focused.is('checkbox') or - focused.is('button')) + focused.is('checkbox')) # activate shortcuts only if modifier keys are not pressed if not(e.shiftKey or e.altKey or e.ctrlKey or e.metaKey) diff --git a/js/public/app.js b/js/public/app.js index 57306e34a..5982ab587 100644 --- a/js/public/app.js +++ b/js/public/app.js @@ -327,7 +327,7 @@ License along with this library. If not, see . return $($window.document).keydown(function(e) { var focused, scrollArea; focused = $(':focus'); - if (!(focused.is('input') || focused.is('select') || focused.is('textarea') || focused.is('checkbox') || focused.is('button'))) { + if (!(focused.is('input') || focused.is('select') || focused.is('textarea') || focused.is('checkbox'))) { if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey)) { scrollArea = elm; if (e.keyCode === 74 || e.keyCode === 39 || e.keyCode === 78) { -- cgit v1.2.3