jenkins-bot has submitted this change and it was merged.
Change subject: Wait for onDocumentFocus to happen before setting section range
......................................................................
Wait for onDocumentFocus to happen before setting section range
Bug: 65928
Change-Id: If76408b6b89541f0ecb065d4860e0652b6bdebb5
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
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 4334238..636a12c 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -1453,7 +1453,11 @@
offset =
surfaceModel.getDocument().data.getNearestContentOffset(
offsetNode.getModel().getOffset(), 1
);
- surfaceModel.setSelection( new ve.Range( offset ) );
+ // onDocumentFocus is debounced, so wait for that to
happen before setting
+ // the model selection, otherwise it will get reset
+ this.surface.getView().once( 'focus', function () {
+ surfaceModel.setSelection( new ve.Range( offset
) );
+ } );
// Scroll to heading:
// Wait for toolbar to animate in so we can account for
its height
setTimeout( function () {
--
To view, visit https://gerrit.wikimedia.org/r/139677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If76408b6b89541f0ecb065d4860e0652b6bdebb5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
