jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399394 )
Change subject: Fix editor switcher inheritance
......................................................................
Fix editor switcher inheritance
Inherit from the non-ve.ui version of the tool as that
one only comes from the ArticleTarget module.
Bug: T183360
Change-Id: I550ebb717de417f99776b578656c1d9f05d59f1f
---
M extension.json
M modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js
2 files changed, 33 insertions(+), 4 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 870a062..1375a9c 100644
--- a/extension.json
+++ b/extension.json
@@ -691,6 +691,7 @@
"ext.visualEditor.desktopTarget",
"ext.visualEditor.mwextensions.desktop",
"ext.visualEditor.mwwikitext",
+ "ext.visualEditor.switching",
"mediawiki.editfont.styles",
"oojs-ui.styles.icons-editing-advanced",
"site",
diff --git a/modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js
b/modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js
index b3b028b..e69910e 100644
--- a/modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js
+++ b/modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js
@@ -6,20 +6,46 @@
*/
/**
+ * MediaWiki UserInterface edit mode tool.
+ *
+ * @class
+ * @abstract
+ */
+mw.flow.ui.MWEditModeTool = function MwFlowUiMWEditModeTool() {
+};
+
+/* Inheritance */
+
+OO.initClass( mw.flow.ui.MWEditModeTool );
+
+/* Methods */
+
+mw.flow.ui.MWEditModeTool.prototype.getMode = function () {
+ return this.toolbar.getSurface().getMode();
+};
+
+mw.flow.ui.MWEditModeTool.prototype.isModeAvailable = function () {
+ // If we're showing the switcher, then both modes are available
+ return true;
+};
+
+/**
* MediaWiki UserInterface edit mode source tool.
*
* @class
* @extends mw.libs.ve.MWEditModeSourceTool
+ * @mixins mw.flow.ui.MWEditModeTool
* @constructor
* @param {OO.ui.ToolGroup} toolGroup
* @param {Object} [config] Config options
*/
-mw.flow.ui.MWEditModeSourceTool = function VeUiMWEditModeSourceTool() {
+mw.flow.ui.MWEditModeSourceTool = function MwFlowUiMWEditModeSourceTool() {
// Parent constructor
mw.flow.ui.MWEditModeSourceTool.parent.apply( this, arguments );
};
-OO.inheritClass( mw.flow.ui.MWEditModeSourceTool, ve.ui.MWEditModeSourceTool );
+OO.inheritClass( mw.flow.ui.MWEditModeSourceTool,
mw.libs.ve.MWEditModeSourceTool );
+OO.mixinClass( mw.flow.ui.MWEditModeSourceTool, mw.flow.ui.MWEditModeTool );
mw.flow.ui.MWEditModeSourceTool.prototype.switch = function () {
var $editor = this.toolbar.getSurface().$element.closest(
'.flow-editor' );
@@ -41,16 +67,18 @@
*
* @class
* @extends mw.libs.ve.MWEditModeVisualTool
+ * @mixins mw.flow.ui.MWEditModeTool
* @constructor
* @param {OO.ui.ToolGroup} toolGroup
* @param {Object} [config] Config options
*/
-mw.flow.ui.MWEditModeVisualTool = function VeUiMWEditModeVisualTool() {
+mw.flow.ui.MWEditModeVisualTool = function MwFlowUiMWEditModeVisualTool() {
// Parent constructor
mw.flow.ui.MWEditModeVisualTool.parent.apply( this, arguments );
};
-OO.inheritClass( mw.flow.ui.MWEditModeVisualTool, ve.ui.MWEditModeVisualTool );
+OO.inheritClass( mw.flow.ui.MWEditModeVisualTool,
mw.libs.ve.MWEditModeVisualTool );
+OO.mixinClass( mw.flow.ui.MWEditModeVisualTool, mw.flow.ui.MWEditModeTool );
mw.flow.ui.MWEditModeVisualTool.prototype.switch = function () {
this.toolbar.getTarget().switchMode();
--
To view, visit https://gerrit.wikimedia.org/r/399394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I550ebb717de417f99776b578656c1d9f05d59f1f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
