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

Commit

Permalink
fix #786
Browse files Browse the repository at this point in the history
  • Loading branch information
Bernhard Posselt committed May 8, 2015
1 parent e76e75a commit 5e1005f
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
owncloud-news (5.3.3)
* **Enhancement**: Add shortcut for marking the current article's feed/folder read, #635
* **Bugfix**: When collapsing an article in compact view, remove content to stop playing audio/video from iframes, #787
* **Bugfix**: If expand in compact view is enabled, keyboard shortcuts will now expand the first item if the scroll position is at the top and the first item has not been expanded yet, #786

owncloud-news (5.3.2)
* **Enhancement**: Disable expand on key navigation setting if compact view is not enabled, #774
Expand Down
7 changes: 6 additions & 1 deletion js/build/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2343,7 +2343,12 @@ app.service('SettingsResource', ["$http", "BASE_URL", function ($http, BASE_URL)
items.each(function (index, item) {
item = $(item);

if (item.position().top > 1) {
// special treatment for items that have expand enabled:
// if you click next and the first item has not been expaned and
// is on the top, it should be expanded instead of the next one
if ((item.position().top === 0 && expandItemInCompact &&
!item.hasClass('open')) ||
item.position().top > 1) {
scrollToItem(scrollArea, item, expandItemInCompact);

jumped = true;
Expand Down
4 changes: 2 additions & 2 deletions js/build/app.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/build/app.min.js.map

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion js/gui/KeyboardShortcuts.js
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,12 @@
items.each(function (index, item) {
item = $(item);

if (item.position().top > 1) {
// special treatment for items that have expand enabled:
// if you click next and the first item has not been expaned and
// is on the top, it should be expanded instead of the next one
if ((item.position().top === 0 && expandItemInCompact &&
!item.hasClass('open')) ||
item.position().top > 1) {
scrollToItem(scrollArea, item, expandItemInCompact);

jumped = true;
Expand Down

0 comments on commit 5e1005f

Please sign in to comment.