wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 06:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mobile surfaceReady: Account for selection changing in listeners

Browse source 
Bug: T232136
Change-Id: Ia49ea99320a8191a4d73703f1cbf3b9ef89035ec
This commit is contained in:
Ed Sanders 2019-09-05 19:25:33 +01:00
parent 7f854ff6ca
commit af0ca43125
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
View file

@ -295,7 +295,7 @@ ve.init.mw.MobileArticleTarget.prototype.setSurface = function ( surface ) {
* @inheritdoc
*/
ve.init.mw.MobileArticleTarget.prototype.surfaceReady = function () {
var surfaceView, surfaceModel;
var surfaceModel;
if ( this.teardownPromise ) {
// Loading was cancelled, the overlay is already closed at this point. Do nothing.
@ -307,16 +307,18 @@ ve.init.mw.MobileArticleTarget.prototype.surfaceReady = function () {
// which calls goToHeading. (T225292)
this.adjustContentPadding();
// Deactivate the surface so any initial selection set in surfaceReady
// listeners doesn't cause the keyboard to be shown.
this.getSurface().getView().deactivate();
// Parent method
ve.init.mw.MobileArticleTarget.super.prototype.surfaceReady.apply( this, arguments );
// Place a selection at the start of the document, but with the surface
// disabled, so toolbar tools have a thing to focus on without us showing the
// keyboard.
surfaceView = this.getSurface().getView();
surfaceView.deactivate();
// If no selection has been set yet, set it to the start of the document.
surfaceModel = this.getSurface().getModel();
surfaceModel.selectFirstContentOffset();
if ( surfaceModel.getSelection().isNull() ) {
surfaceModel.selectFirstContentOffset();
}
this.events.trackActivationComplete();