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.

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

Fix scrolling detection on activity 14 #293

Merged
merged 2 commits into from Sep 10, 2018

Conversation

Projects
None yet
3 participants
@skjnldsv
Copy link
Member

skjnldsv commented Sep 7, 2018

Fix #292

Fix scrolling detection on activity 14
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

@skjnldsv skjnldsv added this to the Nextcloud 15 milestone Sep 7, 2018

@skjnldsv skjnldsv self-assigned this Sep 7, 2018

@skjnldsv skjnldsv requested a review from nickvergessen Sep 7, 2018

firstKnownId: 0,
lastGivenId: 0,
activities: {},

prefill: function () {
this.ignoreScroll += 1;
if (this.$content.scrollTop() + this.$content.height() > this.$container.height() - 100) {
if (this.$content.scrollTop() + $(window).height() > this.$container.height() + 100) {

This comment has been minimized.

@nickvergessen

nickvergessen Sep 10, 2018

Member

I will make it -100 again, so new activities are already loaded, before you reach the end, so ideally you never see the loading circle

This comment has been minimized.

@skjnldsv

skjnldsv Sep 10, 2018

Member

Ah, make sense now. I couldn't figure why it was set to -100!

Preload again
Signed-off-by: Joas Schilling <coding@schilljs.com>

@nickvergessen nickvergessen merged commit 2a1cce4 into master Sep 10, 2018

4 checks passed

Scrutinizer 1 new issues
Details
continuous-integration/drone/pr the build was successful
Details
continuous-integration/drone/push the build was successful
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@nickvergessen nickvergessen deleted the 14-scroll-fix branch Sep 10, 2018

@nickvergessen

This comment has been minimized.

Copy link
Member

nickvergessen commented Sep 10, 2018

Can you prepare a backport on stable14?

@skjnldsv

This comment has been minimized.

Copy link
Member

skjnldsv commented Sep 10, 2018

Of course! :)

@MorrisJobke

This comment has been minimized.

Copy link
Member

MorrisJobke commented Oct 3, 2018

@skjnldsv 🏓

@MorrisJobke

This comment has been minimized.

Copy link
Member

MorrisJobke commented Oct 3, 2018

Ah it was already backported in #295

@MorrisJobke MorrisJobke referenced this pull request Oct 3, 2018

Merged

14 scroll fix #295

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment