jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (19e50b7) ......................................................................
Update VE core submodule to master (19e50b7) New changes: e536779 [DEPRECATING CHANGE] Rename link inspector tools 3899967 Localisation updates from https://translatewiki.net. 0a1c09e [BREAKING CHANGE] ve.init.Target: Upstream the action toolbar from sa/mw desktop targets Local changes: * Refactor tools for the breaking change Change-Id: I676af9c50b09ef007926240eb2327d1a0fdd80f5 --- M .jsduck/eg-iframe.html M extension.json M lib/ve M modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js M modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js M modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js M modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js M modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js 8 files changed, 50 insertions(+), 49 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/.jsduck/eg-iframe.html b/.jsduck/eg-iframe.html index 3098163..25c6100 100644 --- a/.jsduck/eg-iframe.html +++ b/.jsduck/eg-iframe.html @@ -411,12 +411,13 @@ <script src="lib/ve/src/ui/widgets/ve.ui.WhitespacePreservingTextInputWidget.js"></script> <script src="lib/ve/src/ui/tools/ve.ui.AnnotationTool.js"></script> <script src="lib/ve/src/ui/tools/ve.ui.ClearAnnotationTool.js"></script> - <script src="lib/ve/src/ui/tools/ve.ui.DialogTool.js"></script> + <script src="lib/ve/src/ui/tools/ve.ui.WindowTool.js"></script> + <script src="lib/ve/src/ui/tools/ve.ui.FragmentWindowTool.js"></script> + <script src="lib/ve/src/ui/tools/ve.ui.FragmentInspectorTool.js"></script> <script src="lib/ve/src/ui/tools/ve.ui.ToolbarDialogTool.js"></script> <script src="lib/ve/src/ui/tools/ve.ui.FormatTool.js"></script> <script src="lib/ve/src/ui/tools/ve.ui.HistoryTool.js"></script> <script src="lib/ve/src/ui/tools/ve.ui.IndentationTool.js"></script> - <script src="lib/ve/src/ui/tools/ve.ui.InspectorTool.js"></script> <script src="lib/ve/src/ui/tools/ve.ui.LanguageInspectorTool.js"></script> <script src="lib/ve/src/ui/tools/ve.ui.ListTool.js"></script> <script src="lib/ve/src/ui/tools/ve.ui.TableTool.js"></script> diff --git a/extension.json b/extension.json index 3919800..4881b60 100644 --- a/extension.json +++ b/extension.json @@ -749,12 +749,13 @@ "lib/ve/src/ui/widgets/ve.ui.WhitespacePreservingTextInputWidget.js", "lib/ve/src/ui/tools/ve.ui.AnnotationTool.js", "lib/ve/src/ui/tools/ve.ui.ClearAnnotationTool.js", - "lib/ve/src/ui/tools/ve.ui.DialogTool.js", + "lib/ve/src/ui/tools/ve.ui.WindowTool.js", + "lib/ve/src/ui/tools/ve.ui.FragmentWindowTool.js", + "lib/ve/src/ui/tools/ve.ui.FragmentInspectorTool.js", "lib/ve/src/ui/tools/ve.ui.ToolbarDialogTool.js", "lib/ve/src/ui/tools/ve.ui.FormatTool.js", "lib/ve/src/ui/tools/ve.ui.HistoryTool.js", "lib/ve/src/ui/tools/ve.ui.IndentationTool.js", - "lib/ve/src/ui/tools/ve.ui.InspectorTool.js", "lib/ve/src/ui/tools/ve.ui.ListTool.js", "lib/ve/src/ui/tools/ve.ui.TableTool.js", "lib/ve/src/ui/inspectors/ve.ui.FragmentInspector.js", diff --git a/lib/ve b/lib/ve index 601ba8c..19e50b7 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit 601ba8cb774e7a7d965082f32e2b331077cbee35 +Subproject commit 19e50b7845b5abc4199d27eb647e5820df924ebf diff --git a/modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js b/modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js index 10ba637..c7ff569 100644 --- a/modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js +++ b/modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js @@ -9,15 +9,15 @@ * MediaWiki UserInterface gallery tool. * * @class - * @extends ve.ui.InspectorTool + * @extends ve.ui.FragmentInspectorTool * @constructor * @param {OO.ui.ToolGroup} toolGroup * @param {Object} [config] Configuration options */ -ve.ui.MWGalleryInspectorTool = function VeUiMWGalleryInspectorTool( toolGroup, config ) { - ve.ui.InspectorTool.call( this, toolGroup, config ); +ve.ui.MWGalleryInspectorTool = function VeUiMWGalleryInspectorTool() { + ve.ui.MWGalleryInspectorTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWGalleryInspectorTool, ve.ui.InspectorTool ); +OO.inheritClass( ve.ui.MWGalleryInspectorTool, ve.ui.FragmentInspectorTool ); ve.ui.MWGalleryInspectorTool.static.name = 'gallery'; ve.ui.MWGalleryInspectorTool.static.group = 'object'; ve.ui.MWGalleryInspectorTool.static.icon = 'imageGallery'; diff --git a/modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js b/modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js index 844d60b..75edf37 100644 --- a/modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js +++ b/modules/ve-mw/ui/tools/ve.ui.MWMediaDialogTool.js @@ -9,15 +9,15 @@ * MediaWiki UserInterface media edit tool. * * @class - * @extends ve.ui.DialogTool + * @extends ve.ui.FragmentWindowTool * @constructor * @param {OO.ui.ToolGroup} toolGroup * @param {Object} [config] Configuration options */ -ve.ui.MWMediaDialogTool = function VeUiMWMediaDialogTool( toolGroup, config ) { - ve.ui.DialogTool.call( this, toolGroup, config ); +ve.ui.MWMediaDialogTool = function VeUiMWMediaDialogTool() { + ve.ui.MWMediaDialogTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWMediaDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWMediaDialogTool, ve.ui.FragmentWindowTool ); ve.ui.MWMediaDialogTool.static.name = 'media'; ve.ui.MWMediaDialogTool.static.group = 'object'; ve.ui.MWMediaDialogTool.static.icon = 'image'; diff --git a/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js b/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js index b2fc876..4d8d2f9 100644 --- a/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js +++ b/modules/ve-mw/ui/tools/ve.ui.MWMetaDialogTool.js @@ -9,15 +9,15 @@ * MediaWiki UserInterface meta dialog tool. * * @class - * @extends ve.ui.DialogTool + * @extends ve.ui.WindowTool * @constructor * @param {OO.ui.Toolbar} toolbar * @param {Object} [config] Configuration options */ -ve.ui.MWMetaDialogTool = function VeUiMWMetaDialogTool( toolbar, config ) { - ve.ui.DialogTool.call( this, toolbar, config ); +ve.ui.MWMetaDialogTool = function VeUiMWMetaDialogTool() { + ve.ui.MWMetaDialogTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWMetaDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWMetaDialogTool, ve.ui.WindowTool ); ve.ui.MWMetaDialogTool.static.name = 'meta'; ve.ui.MWMetaDialogTool.static.group = 'utility'; ve.ui.MWMetaDialogTool.static.icon = 'window'; @@ -39,15 +39,15 @@ * MediaWiki UserInterface page settings tool. * * @class - * @extends ve.ui.DialogTool + * @extends ve.ui.WindowTool * @constructor * @param {OO.ui.Toolbar} toolbar * @param {Object} [config] Configuration options */ -ve.ui.MWPageSettingsDialogTool = function VeUiMWPageSettingsDialogTool( toolbar, config ) { - ve.ui.DialogTool.call( this, toolbar, config ); +ve.ui.MWPageSettingsDialogTool = function VeUiMWPageSettingsDialogTool() { + ve.ui.MWPageSettingsDialogTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWPageSettingsDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWPageSettingsDialogTool, ve.ui.WindowTool ); ve.ui.MWPageSettingsDialogTool.static.name = 'settings'; ve.ui.MWPageSettingsDialogTool.static.group = 'utility'; ve.ui.MWPageSettingsDialogTool.static.icon = 'settings'; @@ -69,15 +69,15 @@ * MediaWiki UserInterface advanced page settings tool. * * @class - * @extends ve.ui.DialogTool + * @extends ve.ui.WindowTool * @constructor * @param {OO.ui.Toolbar} toolbar * @param {Object} [config] Configuration options */ -ve.ui.MWAdvancedPageSettingsDialogTool = function VeUiMWAdvancedPageSettingsDialogTool( toolbar, config ) { - ve.ui.DialogTool.call( this, toolbar, config ); +ve.ui.MWAdvancedPageSettingsDialogTool = function VeUiMWAdvancedPageSettingsDialogTool() { + ve.ui.MWAdvancedPageSettingsDialogTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWAdvancedPageSettingsDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWAdvancedPageSettingsDialogTool, ve.ui.WindowTool ); ve.ui.MWAdvancedPageSettingsDialogTool.static.name = 'advancedSettings'; ve.ui.MWAdvancedPageSettingsDialogTool.static.group = 'utility'; ve.ui.MWAdvancedPageSettingsDialogTool.static.icon = 'advanced'; @@ -99,15 +99,15 @@ * MediaWiki UserInterface categories tool. * * @class - * @extends ve.ui.DialogTool + * @extends ve.ui.WindowTool * @constructor * @param {OO.ui.Toolbar} toolbar * @param {Object} [config] Configuration options */ -ve.ui.MWCategoriesDialogTool = function VeUiMWCategoriesDialogTool( toolbar, config ) { - ve.ui.DialogTool.call( this, toolbar, config ); +ve.ui.MWCategoriesDialogTool = function VeUiMWCategoriesDialogTool() { + ve.ui.MWCategoriesDialogTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWCategoriesDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWCategoriesDialogTool, ve.ui.WindowTool ); ve.ui.MWCategoriesDialogTool.static.name = 'categories'; ve.ui.MWCategoriesDialogTool.static.group = 'utility'; ve.ui.MWCategoriesDialogTool.static.icon = 'tag'; @@ -129,15 +129,15 @@ * MediaWiki UserInterface languages tool. * * @class - * @extends ve.ui.DialogTool + * @extends ve.ui.WindowTool * @constructor * @param {OO.ui.Toolbar} toolbar * @param {Object} [config] Configuration options */ -ve.ui.MWLanguagesDialogTool = function VeUiMWLanguagesDialogTool( toolbar, config ) { - ve.ui.DialogTool.call( this, toolbar, config ); +ve.ui.MWLanguagesDialogTool = function VeUiMWLanguagesDialogTool() { + ve.ui.MWLanguagesDialogTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWLanguagesDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWLanguagesDialogTool, ve.ui.WindowTool ); ve.ui.MWLanguagesDialogTool.static.name = 'languages'; ve.ui.MWLanguagesDialogTool.static.group = 'utility'; ve.ui.MWLanguagesDialogTool.static.icon = 'textLanguage'; diff --git a/modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js b/modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js index a365e16..801c984 100644 --- a/modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js +++ b/modules/ve-mw/ui/tools/ve.ui.MWReferenceDialogTool.js @@ -9,15 +9,15 @@ * MediaWiki UserInterface reference tool. * * @class - * @extends ve.ui.DialogTool + * @extends ve.ui.FragmentWindowTool * @constructor * @param {OO.ui.ToolGroup} toolGroup * @param {Object} [config] Configuration options */ -ve.ui.MWReferenceDialogTool = function VeUiMWReferenceDialogTool( toolGroup, config ) { - ve.ui.DialogTool.call( this, toolGroup, config ); +ve.ui.MWReferenceDialogTool = function VeUiMWReferenceDialogTool() { + ve.ui.MWReferenceDialogTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWReferenceDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWReferenceDialogTool, ve.ui.FragmentWindowTool ); ve.ui.MWReferenceDialogTool.static.name = 'reference'; ve.ui.MWReferenceDialogTool.static.group = 'object'; ve.ui.MWReferenceDialogTool.static.icon = 'reference'; @@ -32,21 +32,20 @@ * MediaWiki UserInterface use existing reference tool. * * @class - * @extends ve.ui.DialogTool + * @extends ve.ui.WindowTool * @constructor * @param {OO.ui.ToolGroup} toolGroup * @param {Object} [config] Configuration options */ -ve.ui.MWUseExistingReferenceDialogTool = function VeUiMWUseExistingReferenceDialogTool( toolGroup, config ) { - ve.ui.DialogTool.call( this, toolGroup, config ); +ve.ui.MWUseExistingReferenceDialogTool = function VeUiMWUseExistingReferenceDialogTool() { + ve.ui.MWUseExistingReferenceDialogTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWUseExistingReferenceDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWUseExistingReferenceDialogTool, ve.ui.WindowTool ); ve.ui.MWUseExistingReferenceDialogTool.static.name = 'reference/existing'; ve.ui.MWUseExistingReferenceDialogTool.static.group = 'object'; ve.ui.MWUseExistingReferenceDialogTool.static.icon = 'reference-existing'; ve.ui.MWUseExistingReferenceDialogTool.static.title = OO.ui.deferMsg( 'visualeditor-dialog-reference-useexisting-tool' ); -ve.ui.MWUseExistingReferenceDialogTool.static.modelClasses = []; ve.ui.MWUseExistingReferenceDialogTool.static.commandName = 'reference/existing'; ve.ui.MWUseExistingReferenceDialogTool.static.autoAddToGroup = false; ve.ui.MWUseExistingReferenceDialogTool.static.autoAddToCatchall = false; @@ -73,15 +72,15 @@ * MediaWiki UserInterface references list tool. * * @class - * @extends ve.ui.DialogTool + * @extends ve.ui.FragmentWindowTool * @constructor * @param {OO.ui.ToolGroup} toolGroup * @param {Object} [config] Configuration options */ -ve.ui.MWReferencesListDialogTool = function VeUiMWReferencesListDialogTool( toolGroup, config ) { - ve.ui.DialogTool.call( this, toolGroup, config ); +ve.ui.MWReferencesListDialogTool = function VeUiMWReferencesListDialogTool() { + ve.ui.MWReferencesListDialogTool.super.apply( this, arguments ); }; -OO.inheritClass( ve.ui.MWReferencesListDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWReferencesListDialogTool, ve.ui.FragmentWindowTool ); ve.ui.MWReferencesListDialogTool.static.name = 'referencesList'; ve.ui.MWReferencesListDialogTool.static.group = 'object'; ve.ui.MWReferencesListDialogTool.static.icon = 'references'; diff --git a/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js b/modules/ve-mw/ui/tools/ve.ui.MWTransclusionDialogTool.js index 646bde9..4ee8ed8 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.DialogTool + * @extends ve.ui.WindowTool * @constructor * @param {OO.ui.ToolGroup} toolGroup * @param {Object} [config] Configuration options */ ve.ui.MWTransclusionDialogTool = function VeUiMWTransclusionDialogTool( toolGroup, config ) { - ve.ui.DialogTool.call( this, toolGroup, config ); + ve.ui.WindowTool.call( this, toolGroup, config ); }; /* Inheritance */ -OO.inheritClass( ve.ui.MWTransclusionDialogTool, ve.ui.DialogTool ); +OO.inheritClass( ve.ui.MWTransclusionDialogTool, ve.ui.WindowTool ); /* Static Properties */ @@ -55,7 +55,7 @@ var compatible; // Parent method - compatible = ve.ui.DialogTool.static.isCompatibleWith.call( this, model ); + compatible = ve.ui.WindowTool.static.isCompatibleWith.call( this, model ); if ( compatible && this.template ) { return model.isSingleTemplate( this.template ); -- To view, visit https://gerrit.wikimedia.org/r/257589 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I676af9c50b09ef007926240eb2327d1a0fdd80f5 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
