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

Merge "ve.ui.MWTemplateDialog: Prevent focus changes in the setup process"

Browse source
This commit is contained in:
jenkins-bot 2018-07-19 17:43:11 +00:00 committed by Gerrit Code Review
parent ff10c01687 668ce071fa
commit 33be736e13
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
View file

@ -448,7 +448,8 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
data = data || {};
return ve.ui.MWTemplateDialog.super.prototype.getSetupProcess.call( this, data )
.next( function () {
var template, promise;
var template, promise,
bookletLayout = this.bookletLayout;
// Properties
this.loaded = false;
@ -462,7 +463,10 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
} );
// Detach the form while building for performance
this.bookletLayout.$element.detach();
bookletLayout.$element.detach();
// HACK: Prevent any setPage() calls (from #onReplacePart) from focussing stuff, it messes
// with OOUI logic for marking fields as invalid (T199838). We set it back to true below.
bookletLayout.autoFocus = false;
// Initialization
if ( !this.selectedNode ) {
@ -495,9 +499,11 @@ ve.ui.MWTemplateDialog.prototype.getSetupProcess = function ( data ) {
this.loaded = true;
this.$element.addClass( 've-ui-mwTemplateDialog-ready' );
this.$body.append( this.bookletLayout.$element );
this.$body.append( bookletLayout.$element );
return promise;
return promise.then( function () {
bookletLayout.autoFocus = true;
} );
}, this );
};