garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

'j' should no longer skip short entries (fix #169)

Browse Source
This commit is contained in:
Athou
2013-06-26 12:25:44 +02:00
parent 7546a58780
commit e0ea822333
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/webapp/js/directives.js
View File

@@ -79,20 +79,20 @@ module.directive('onScrollMiddle', function() {
var w = $(window); var w = $(window);
var e = $(element); var e = $(element);
var d = $(document); var d = $(document);
var offset = parseInt(attrs.onScrollMiddleOffset, 10);
var down = function() { var down = function() {
var docTop = w.scrollTop(); var docTop = w.scrollTop();
var elemTop = e.offset().top; var elemTop = e.offset().top;
var threshold = docTop === 0 ? elemTop - 1 : docTop var threshold = docTop === 0 ? elemTop - 1 : docTop + offset;
+ w.height() / 3;
return (elemTop > threshold) ? 'below' : 'above'; return (elemTop > threshold) ? 'below' : 'above';
}; };
var up = function() { var up = function() {
var docTop = w.scrollTop(); var docTop = w.scrollTop();
var elemTop = e.offset().top; var elemTop = e.offset().top;
var elemBottom = elemTop + e.height(); var elemBottom = elemTop + e.height();
var threshold = docTop === 0 ? elemBottom - 1 : docTop var threshold = docTop === 0 ? elemBottom - 1 : docTop + offset;
+ w.height() / 3;
return (elemBottom > threshold) ? 'below' : 'above'; return (elemBottom > threshold) ? 'below' : 'above';
}; };

5
src/main/webapp/templates/feeds.view.html
View File

@@ -14,8 +14,9 @@
<div infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy || !settingsService.settings.readingMode" infinite-scroll-distance="1" id="feed-accordion" <div infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy || !settingsService.settings.readingMode" infinite-scroll-distance="1" id="feed-accordion"
ng-class="{'expanded' : settingsService.settings.viewMode == 'expanded' }"> ng-class="{'expanded' : settingsService.settings.viewMode == 'expanded' }">
<div ng-show="message && errorCount > 10">${view.error_while_loading_feed} : {{message}}</div> <div ng-show="message && errorCount > 10">${view.error_while_loading_feed} : {{message}}</div>
<div ng-repeat="entry in entries" class="entry" scroll-to="navigationMode != 'scroll' && current == entry" <div ng-repeat="entry in entries" class="entry"
scroll-to-force="navigationMode == 'keyboard'" scroll-to-offset="-50" on-scroll-middle="onScroll(entry)" scroll-to="navigationMode != 'scroll' && current == entry" scroll-to-force="navigationMode == 'keyboard'" scroll-to-offset="-50"
on-scroll-middle="onScroll(entry)" on-scroll-middle-offset="50"
ng-class="{unread: entry.read == false, current: current==entry, open: isOpen, closed: !isOpen}"> ng-class="{unread: entry.read == false, current: current==entry, open: isOpen, closed: !isOpen}">
<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="noop($event)" ng-mouseup="entryClicked(entry, $event)"> <a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="noop($event)" ng-mouseup="entryClicked(entry, $event)">
<span class="feed-name visible-desktop"> <span class="feed-name visible-desktop">