jenkins-bot has submitted this change and it was merged.
Change subject: Simplify context item for MWAlienExtensionNodes
......................................................................
Simplify context item for MWAlienExtensionNodes
Just show the name of extension. 'MediaWiki extension' is meaningless
to most people.
Change-Id: I64dc4914874b3fb3f807d7e0155ad31f2a8e703e
---
M VisualEditor.php
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
A modules/ve-mw/ui/contextitems/ve.ui.MWAlienExtensionContextItem.js
M modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
D modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
7 files changed, 48 insertions(+), 43 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index 5c226b9..987b669 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -1499,16 +1499,13 @@
'modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js',
'modules/ve-mw/ce/nodes/ve.ce.MWAlienExtensionNode.js',
'modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js',
-
'modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js',
+
'modules/ve-mw/ui/contextitems/ve.ui.MWAlienExtensionContextItem.js',
),
'styles' => array(
'modules/ve-mw/ui/styles/inspectors/ve.ui.MWAlienExtensionInspector.css',
),
'dependencies' => array(
'ext.visualEditor.mwcore',
- ),
- 'messages' => array(
- 'visualeditor-mwalienextensioninspector-title',
),
'targets' => array( 'desktop', 'mobile' ),
),
diff --git a/extension.json b/extension.json
index 5a9f418..13f5376 100644
--- a/extension.json
+++ b/extension.json
@@ -1522,16 +1522,13 @@
"modules/ve-mw/dm/nodes/ve.dm.MWAlienExtensionNode.js",
"modules/ve-mw/ce/nodes/ve.ce.MWAlienExtensionNode.js",
"modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js",
-
"modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js"
+
"modules/ve-mw/ui/contextitems/ve.ui.MWAlienExtensionContextItem.js"
],
"styles": [
"modules/ve-mw/ui/styles/inspectors/ve.ui.MWAlienExtensionInspector.css"
],
"dependencies": [
"ext.visualEditor.mwcore"
- ],
- "messages": [
- "visualeditor-mwalienextensioninspector-title"
],
"targets": [
"desktop",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index c1a31a2..cadb404 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -254,7 +254,6 @@
"visualeditor-mainnamespacepagelink": "Project:Main namespace",
"visualeditor-media-input-placeholder": "Search for media",
"visualeditor-meta-tool": "Options",
- "visualeditor-mwalienextensioninspector-title": "MediaWiki extension",
"visualeditor-mweditmodesource-title": "Switch to source editing?",
"visualeditor-mweditmodesource-tool": "Switch to source editing",
"visualeditor-mweditmodesource-warning": "You are about to switch to
source editing.\nAny changes you've made to this document can be kept, but you
will not be able switch back to VisualEditor without saving or reloading the
page.\nDo you want to continue?",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index f1c36f6..93690f2 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -263,7 +263,6 @@
"visualeditor-mainnamespacepagelink": "Name of a page describing the
main namespace (NS0) in this project.\n{{doc-important|Do not translate
\"Project\"; it is automatically converted to the wiki's project namespace.}}",
"visualeditor-media-input-placeholder": "Place holder text for media
search input",
"visualeditor-meta-tool": "Text of tool in the toolbar the lets users
set categories, language links and other page settings.\n{{Identical|Options}}",
- "visualeditor-mwalienextensioninspector-title": "Used as title for
unknown MediaWiki extensions.\n{{Identical|MediaWiki extension}}",
"visualeditor-mweditmodesource-title": "Title of dialog to confirm
switching to source mode.",
"visualeditor-mweditmodesource-tool": "Label for tool that changes edit
mode to source editing.",
"visualeditor-mweditmodesource-warning": "Warning message show before
changing edit mode to source editing. It allows the user to keep the changes or
to start source editing from scratch using the message
{{msg-mw|Visualeditor-mweditmodesource-warning-switch}} and
{{msg-mw|Visualeditor-mweditmodesource-warning-switch-discard}}.",
diff --git a/modules/ve-mw/ui/contextitems/ve.ui.MWAlienExtensionContextItem.js
b/modules/ve-mw/ui/contextitems/ve.ui.MWAlienExtensionContextItem.js
new file mode 100644
index 0000000..0623f6f
--- /dev/null
+++ b/modules/ve-mw/ui/contextitems/ve.ui.MWAlienExtensionContextItem.js
@@ -0,0 +1,46 @@
+/*!
+ * VisualEditor MWAlienExtensionContextItem class.
+ *
+ * @copyright 2011-2015 VisualEditor Team and others; see
http://ve.mit-license.org
+ */
+
+/**
+ * Context item for a MWAlienExtension.
+ *
+ * @class
+ * @extends ve.ui.ContextItem
+ *
+ * @constructor
+ * @param {ve.ui.Context} context Context item is in
+ * @param {ve.dm.Model} model Model item is related to
+ * @param {Object} config Configuration options
+ */
+ve.ui.MWAlienExtensionContextItem = function VeMWAlienExtensionContextItem(
context, model ) {
+ // Parent constructor
+ ve.ui.MWAlienExtensionContextItem.super.apply( this, arguments );
+
+ // Initialization
+ this.$element.addClass( 've-ui-mwAlienExtensionContextItem' );
+
+ this.setLabel( model.getExtensionName() );
+};
+
+/* Inheritance */
+
+OO.inheritClass( ve.ui.MWAlienExtensionContextItem, ve.ui.ContextItem );
+
+/* Static Properties */
+
+ve.ui.MWAlienExtensionContextItem.static.name = 'alienExtension';
+
+ve.ui.MWAlienExtensionContextItem.static.icon = 'alienextension';
+
+ve.ui.MWAlienExtensionContextItem.static.modelClasses = [
ve.dm.MWAlienExtensionNode ];
+
+ve.ui.MWAlienExtensionContextItem.static.commandName = 'alienExtension';
+
+/* Methods */
+
+/* Registration */
+
+ve.ui.contextItemFactory.register( ve.ui.MWAlienExtensionContextItem );
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
b/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
index 4c76728..74924b8 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWAlienExtensionInspector.js
@@ -33,9 +33,6 @@
ve.ui.MWAlienExtensionInspector.static.icon = 'alienextension';
-ve.ui.MWAlienExtensionInspector.static.title =
- OO.ui.deferMsg( 'visualeditor-mwalienextensioninspector-title' );
-
ve.ui.MWAlienExtensionInspector.static.nodeModel = ve.dm.MWAlienExtensionNode;
/* Methods */
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
b/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
deleted file mode 100644
index ae0280e..0000000
--- a/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*!
- * VisualEditor Experimental MediaWiki UserInterface alien extension tool
class.
- *
- * @copyright 2011-2015 VisualEditor Team and others; see AUTHORS.txt
- * @license The MIT License (MIT); see LICENSE.txt
- */
-
-/**
- * Modeless dialog for inspecting unsupported MediaWiki extension nodes.
- *
- * @class
- * @extends ve.ui.InspectorTool
- * @constructor
- * @param {OO.ui.ToolGroup} toolGroup
- * @param {Object} [config] Configuration options
- */
-ve.ui.MWAlienExtensionInspectorTool = function
VeUiMWAlienExtensionInspectorTool( toolGroup, config ) {
- ve.ui.InspectorTool.call( this, toolGroup, config );
-};
-OO.inheritClass( ve.ui.MWAlienExtensionInspectorTool, ve.ui.InspectorTool );
-ve.ui.MWAlienExtensionInspectorTool.static.name = 'alienExtension';
-ve.ui.MWAlienExtensionInspectorTool.static.group = 'object';
-ve.ui.MWAlienExtensionInspectorTool.static.icon = 'alienextension';
-ve.ui.MWAlienExtensionInspectorTool.static.title =
- OO.ui.deferMsg( 'visualeditor-mwalienextensioninspector-title' );
-ve.ui.MWAlienExtensionInspectorTool.static.modelClasses = [
ve.dm.MWAlienExtensionNode ];
-ve.ui.MWAlienExtensionInspectorTool.static.commandName = 'alienExtension';
-ve.ui.MWAlienExtensionInspectorTool.static.autoAddToCatchall = false;
-ve.ui.MWAlienExtensionInspectorTool.static.autoAddToGroup = false;
-ve.ui.toolFactory.register( ve.ui.MWAlienExtensionInspectorTool );
--
To view, visit https://gerrit.wikimedia.org/r/200219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64dc4914874b3fb3f807d7e0155ad31f2a8e703e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
