jenkins-bot has submitted this change and it was merged. Change subject: Fix inheritance of ve.ui.MWTransclusionDialogTool ......................................................................
Fix inheritance of ve.ui.MWTransclusionDialogTool From the description of the commit message[1] for WindowTool and FragmentWindowTool, the ve.ui.MWTransclusionDialogTool should be a FragmentWindowTool, and not a WindowTool. In fact, the bug is caused by the missing isCompatibleWith method in WindowTool. [1] I3a0e761f0d6e942d503ec Follow up: I676af9c50b09ef007926240eb2327d1a0fdd80f5 Bug: T121596 Change-Id: I9a47e5d67fcd7a94155b7cf77c734c94b0ed69e1 (cherry picked from commit 5627701cb1899ca751d609ca7f57f86e0cca8cc2) --- M modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js index 4ee8ed8..eecfe95 100644 --- a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js +++ b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js @@ -9,18 +9,18 @@ * MediaWiki UserInterface transclusion tool. * * @class - * @extends ve.ui.WindowTool + * @extends ve.ui.FragmentWindowTool * @constructor * @param {OO.ui.ToolGroup} toolGroup * @param {Object} [config] Configuration options */ -ve.ui.MWTransclusionDialogTool = function VeUiMWTransclusionDialogTool( toolGroup, config ) { - ve.ui.WindowTool.call( this, toolGroup, config ); +ve.ui.MWTransclusionDialogTool = function VeUiMWTransclusionDialogTool() { + ve.ui.MWTransclusionDialogTool.super.apply( this, arguments ); }; /* Inheritance */ -OO.inheritClass( ve.ui.MWTransclusionDialogTool, ve.ui.WindowTool ); +OO.inheritClass( ve.ui.MWTransclusionDialogTool, ve.ui.FragmentWindowTool ); /* Static Properties */ @@ -55,7 +55,7 @@ var compatible; // Parent method - compatible = ve.ui.WindowTool.static.isCompatibleWith.call( this, model ); + compatible = ve.ui.MWTransclusionDialogTool.super.static.isCompatibleWith.call( this, model ); if ( compatible && this.template ) { return model.isSingleTemplate( this.template ); -- To view, visit https://gerrit.wikimedia.org/r/260430 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a47e5d67fcd7a94155b7cf77c734c94b0ed69e1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: wmf/1.27.0-wmf.9 Gerrit-Owner: Alex Monk <kren...@gmail.com> Gerrit-Reviewer: Alex Monk <kren...@gmail.com> Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits