jenkins-bot has submitted this change and it was merged.
Change subject: Fix section scrolling
......................................................................
Fix section scrolling
Core code now has a scrollIntoView animation triggered on focus
which needs to be cancelled before we scroll to the section heading.
Change-Id: I5eb6a5c98b38c2510d2d7f0108fe56e607b34bd6
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 62bab98..9022ca2 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1347,7 +1347,9 @@
var nextNode, offset,
target = this,
offsetNode = headingNode,
- surfaceModel = this.getSurface().getView().getModel(),
+ surface = this.getSurface(),
+ surfaceModel = surface.getModel(),
+ surfaceView = surface.getView(),
lastHeadingLevel = -1;
// Find next sibling which isn't a heading
@@ -1365,8 +1367,11 @@
);
// onDocumentFocus is debounced, so wait for that to happen before
setting
// the model selection, otherwise it will get reset
- this.getSurface().getView().once( 'focus', function () {
+ surfaceView.once( 'focus', function () {
surfaceModel.setLinearSelection( new ve.Range( offset ) );
+ // Focussing the document triggers showSelection which calls
scrollIntoView
+ // which uses a jQuery animation, so make sure this is aborted.
+ $( OO.ui.Element.static.getClosestScrollableContainer(
surfaceView.$element[0] ) ).stop( true );
target.scrollToHeading( headingNode );
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/223555
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5eb6a5c98b38c2510d2d7f0108fe56e607b34bd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
