Skip to content

autoMarkRead scroll to mark as read #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
primaeval wants to merge 1 commit into
base: master
Choose a base branch
from
Open

autoMarkRead scroll to mark as read #227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions chrome/content/feedview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,10 +331,10 @@ FeedView.prototype = {
},

_autoMarkRead: function FeedView__autoMarkRead() {
if (PrefCache.autoMarkRead && !this.headlinesMode && this.query.read !== false) {
if (PrefCache.autoMarkRead && this.query.read !== false) {
clearTimeout(this._markVisibleTimeout);
let callback = this._callbackRefreshGuard(this.markVisibleEntriesRead.bind(this));
this._markVisibleTimeout = setTimeout(callback, 500);
this._markVisibleTimeout = setTimeout(callback, 0);
}
},

Expand All @@ -359,7 +359,7 @@ FeedView.prototype = {
let entryTop = entries[i].offsetTop;
let entryBottom = entryTop + entries[i].height;

if (entryTop >= winTop && (entryBottom < winBottom || entryTop < winBottom - 200))
if (entryTop < winTop)
entriesToMark.push(entries[i].id);
}

Expand Down Expand Up @@ -440,6 +440,7 @@ FeedView.prototype = {
break;

case 'resize':
this.document.getElementById('feed-padding').setAttribute("style","height:" + this.window.innerHeight + "px");
if (!this.enoughEntriesPreloaded(MIN_LOADED_WINDOW_HEIGHTS))
this._fillWindow(WINDOW_HEIGHTS_LOAD)
.catch(this._ignoreRefresh);
Expand Down Expand Up @@ -704,6 +705,10 @@ FeedView.prototype = {
this.document.body.removeChild(this.feedContent);
let content = this.document.createElement('div');
content.id = 'feed-content';
let padding = this.document.createElement('div');
padding.id = 'feed-padding';
padding.setAttribute("style","height:" + this.window.innerHeight + "px")
content.appendChild(padding);
this.document.body.appendChild(content);

// Prevent the message from briefly showing up before entries are loaded.
Expand Down Expand Up @@ -838,7 +843,7 @@ FeedView.prototype = {
let entryView = new EntryView(this, aEntryData);

let nextEntryView = this._entryViews[aPosition];
let nextElem = nextEntryView ? nextEntryView.container : null;
let nextElem = nextEntryView ? nextEntryView.container : this.document.getElementById('feed-padding');

if (this.headlinesMode) {
if (nextEntryView && entryView.day > nextEntryView.day)
Expand Down