jenkins-bot has submitted this change and it was merged.
Change subject: Set selection before focusing document
......................................................................
Set selection before focusing document
Otherwise the selection is momentarily reset and the
page scrolls to the top.
Bug: 68589
Bug: 68708
Change-Id: I7151c00a90312fb127ebf2120383c19b771ef6c7
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index f33f918..43440e9 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -2166,10 +2166,6 @@
rangySel = rangy.getSelection( this.$document[0] ),
rangyRange = rangy.createRange( this.$document[0] );
- // Setting a range doesn't give focus in all browsers so make sure this
happens
- if ( this.getElementDocument().activeElement !== documentElement ) {
- documentElement.focus();
- }
if ( selection.end ) {
rangyRange.setStart( selection.start.node,
selection.start.offset );
rangyRange.setEnd( selection.end.node, selection.end.offset );
@@ -2179,6 +2175,11 @@
rangyRange.setStart( selection.start.node,
selection.start.offset );
rangySel.setSingleRange( rangyRange );
}
+ // Setting a range doesn't give focus in all browsers so make sure this
happens
+ // Also set focus after range to prevent scrolling to top
+ if ( this.getElementDocument().activeElement !== documentElement ) {
+ documentElement.focus();
+ }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/151400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7151c00a90312fb127ebf2120383c19b771ef6c7
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: 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
