Skip to content
This repository has been archived by the owner on Jul 6, 2020. It is now read-only.

Commit

Permalink
Don't prevent shortcuts if a button (starred icon for instance) is fo…
Browse files Browse the repository at this point in the history 
…cused (theres no input for buttons anyways), fix #497
  • Loading branch information
Bernhard Posselt committed Apr 3, 2014
1 parent 4ab9494 commit 19bab14
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions js/app/directives/itemshortcuts.coffee
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion js/public/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
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) {
Expand Down

4 comments on commit 19bab14

@stefan-niedermann
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the 1.808-Update, i have the strange behaviour that no excerpt is shown anymore...
Owncloud 6.0.1

2014-04-04_12h38_54

@BernhardPosselt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clear the cache and check the logs?

@stefan-niedermann
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, cache was the problem.
Have you thought about including you scripts with a dummy-get-parameter? like src="./path/to/script.js?v=1"?
And if you release a new version you can just count the parameter up. This will keep cache-functionallity, but if you release a new version, browser will load the new version ;)

cheers

@BernhardPosselt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope because core creates one big file anyways so i have no control over that

Please sign in to comment.