jenkins-bot has submitted this change and it was merged.
Change subject: TOC: Trigger the loadmore check after each load
......................................................................
TOC: Trigger the loadmore check after each load
The loadmore code was attempting to trigger the scroll.flow event,
but under some circumstances was triggering it against an unparented
target. Our actual handler is not the target but an element in the
bubble path, so the unparented event did not trigger the right code.
This removes the unnecessary check in flow-board-loadmore.js, and
adjusts to trigger the 'scroll.flow' event on the correct elements.
Change-Id: I8ecb1c417e6a378aeb582002e669ec288cc8d076
---
M modules/engine/components/board/features/flow-board-loadmore.js
M modules/engine/components/board/features/flow-board-toc.js
2 files changed, 1 insertion(+), 8 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/engine/components/board/features/flow-board-loadmore.js
b/modules/engine/components/board/features/flow-board-loadmore.js
index eb219fd..2f1e040 100644
--- a/modules/engine/components/board/features/flow-board-loadmore.js
+++ b/modules/engine/components/board/features/flow-board-loadmore.js
@@ -345,13 +345,6 @@
$target.on( 'scroll.flow', $.throttle( 50, function () {
_flowBoardComponentLoadMoreFeatureInfiniteScrollCheck.call( board,
$scrollContainer, $target );
} ) );
-
- // Auto-trigger to keep loading if the new button is
already in the viewport
- if ( $button.is( ':visible' ) ) {
- setTimeout( function () {
- $button.parents().trigger(
'scroll.flow' );
- }, 100 );
- }
}
}
FlowBoardComponentLoadMoreFeatureMixin.UI.events.loadHandlers.loadMore
= flowBoardComponentLoadMoreFeatureElementLoadCallback;
diff --git a/modules/engine/components/board/features/flow-board-toc.js
b/modules/engine/components/board/features/flow-board-toc.js
index 4508944..74b7fbf 100644
--- a/modules/engine/components/board/features/flow-board-toc.js
+++ b/modules/engine/components/board/features/flow-board-toc.js
@@ -220,7 +220,7 @@
}
// Triggers load more if we didn't load enough content to fill
the viewport
- info.$target.trigger( 'scroll.flow' );
+ $kids.trigger( 'scroll.flow' );
}
FlowBoardComponentTocFeatureMixin.UI.events.apiHandlers.topicList =
flowBoardComponentTocFeatureMixinTopicListApiHandler;
--
To view, visit https://gerrit.wikimedia.org/r/180115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ecb1c417e6a378aeb582002e669ec288cc8d076
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: SG <shah...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
