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

Merge "Ensure that ve.init.target is correct when re-activating an ArticleTarget"

Browse source
This commit is contained in:
jenkins-bot 2020-03-11 23:28:23 +00:00 committed by Gerrit Code Review
parent c2975804a8 bcfb250f56
commit cb9895e304
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ve-mw/init/targets/ve.init.mw.ArticleTarget.js
View file

@ -29,6 +29,13 @@ ve.init.mw.ArticleTarget = function VeInitMwArticleTarget( config ) {
// Parent constructor
ve.init.mw.ArticleTarget.super.call( this, config );
// Register
if ( config.register !== false ) {
// ArticleTargets are never destroyed, but we can't trust ve.init.target to
// not get overridden by other targets that may get created on the page.
ve.init.articleTarget = this;
}
// Properties
this.saveDialog = null;
this.saveDeferred = null;

4
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -404,6 +404,10 @@ ve.init.mw.DesktopArticleTarget.prototype.activate = function ( dataPromise ) {
var surface,
target = this;
// We may be re-activating an old target, during which time ve.init.target
// has been overridden.
ve.init.target = ve.init.articleTarget;
if ( !this.active && !this.activating ) {
this.activating = true;
this.activatingDeferred = ve.createDeferred();