jenkins-bot has submitted this change and it was merged.
Change subject: Add MW meta button to toolbar
......................................................................
Add MW meta button to toolbar
Bug: 48561
Change-Id: Ibf63329a53bcd8043d46315239c19be4e681a18a
---
M VisualEditor.i18n.php
M VisualEditor.php
M demos/ve/index.php
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
M modules/ve/test/index.php
A modules/ve/ui/tools/buttons/ve.ui.MWMetaButtonTool.js
6 files changed, 45 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index 7712f08..fdb9951 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -68,6 +68,7 @@
'visualeditor-annotationbutton-bold-tooltip' => 'Bold',
'visualeditor-annotationbutton-italic-tooltip' => 'Italic',
'visualeditor-annotationbutton-link-tooltip' => 'Link',
+ 'visualeditor-dialogbutton-meta-tooltip' => 'Page settings',
'visualeditor-dialogbutton-reference-tooltip' => 'Reference',
'visualeditor-dialogbutton-template-tooltip' => 'Template',
'visualeditor-dialogbutton-media-tooltip' => 'Media',
diff --git a/VisualEditor.php b/VisualEditor.php
index 4e266df..c43ffd1 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -538,6 +538,7 @@
've/ui/dialogs/ve.ui.MWMetaDialog.js',
+ 've/ui/tools/buttons/ve.ui.MWMetaButtonTool.js',
've/ui/tools/buttons/ve.ui.MWReferenceButtonTool.js',
've/ui/tools/buttons/ve.ui.MWTemplateButtonTool.js',
've/ui/dialogs/ve.ui.MWReferenceDialog.js',
@@ -552,6 +553,7 @@
'visualeditor-dialog-template-title',
'visualeditor-dialogbutton-template-tooltip',
'visualeditor-dialog-meta-title',
+ 'visualeditor-dialogbutton-meta-tooltip',
),
),
'ext.visualEditor.icons-raster' => $wgVisualEditorResourceTemplate +
array(
diff --git a/demos/ve/index.php b/demos/ve/index.php
index 243737f..31b7c6d 100644
--- a/demos/ve/index.php
+++ b/demos/ve/index.php
@@ -316,6 +316,7 @@
<script
src="../../modules/ve/ce/nodes/ve.ce.MWTemplateNode.js"></script>
<script
src="../../modules/ve/ce/nodes/ve.ce.MWReferenceListNode.js"></script>
<script
src="../../modules/ve/ce/nodes/ve.ce.MWReferenceNode.js"></script>
+ <script
src="../../modules/ve/ui/tools/buttons/ve.ui.MWMetaButtonTool.js"></script>
<script
src="../../modules/ve/ui/tools/buttons/ve.ui.MWReferenceButtonTool.js"></script>
<script
src="../../modules/ve/ui/tools/buttons/ve.ui.MWTemplateButtonTool.js"></script>
<script
src="../../modules/ve/ui/dialogs/ve.ui.MWReferenceDialog.js"></script>
diff --git a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
index 628d1a3..dc259fe 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -156,7 +156,8 @@
{ 'items': ['undo', 'redo'] },
{ 'items': ['mwFormat'] },
{ 'items': ['bold', 'italic', 'mwLink', 'clear'] },
- { 'items': ['number', 'bullet', 'outdent', 'indent'] }
+ { 'items': ['number', 'bullet', 'outdent', 'indent'] },
+ { 'items': ['mwMeta'] }
];
ve.init.mw.ViewPageTarget.static.surfaceCommands = [
diff --git a/modules/ve/test/index.php b/modules/ve/test/index.php
index 2b255b0..e3f6daf 100644
--- a/modules/ve/test/index.php
+++ b/modules/ve/test/index.php
@@ -270,6 +270,7 @@
<script
src="../../ve/ce/nodes/ve.ce.MWTemplateNode.js"></script>
<script
src="../../ve/ce/nodes/ve.ce.MWReferenceListNode.js"></script>
<script
src="../../ve/ce/nodes/ve.ce.MWReferenceNode.js"></script>
+ <script
src="../../ve/ui/tools/buttons/ve.ui.MWMetaButtonTool.js"></script>
<script
src="../../ve/ui/tools/buttons/ve.ui.MWReferenceButtonTool.js"></script>
<script
src="../../ve/ui/tools/buttons/ve.ui.MWTemplateButtonTool.js"></script>
<script
src="../../ve/ui/dialogs/ve.ui.MWReferenceDialog.js"></script>
diff --git a/modules/ve/ui/tools/buttons/ve.ui.MWMetaButtonTool.js
b/modules/ve/ui/tools/buttons/ve.ui.MWMetaButtonTool.js
new file mode 100644
index 0000000..5fd92ed
--- /dev/null
+++ b/modules/ve/ui/tools/buttons/ve.ui.MWMetaButtonTool.js
@@ -0,0 +1,38 @@
+/*!
+ * VisualEditor UserInterface MWMetaButtonTool class.
+ *
+ * @copyright 2011-2013 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+/**
+ * Meta button tool.
+ *
+ * @class
+ * @extends ve.ui.DialogButtonTool
+ * @constructor
+ * @param {ve.ui.Toolbar} toolbar
+ * @param {Object} [config] Config options
+ */
+ve.ui.MWMetaButtonTool = function VeUiMWMetaButtonTool( toolbar, config ) {
+ // Parent constructor
+ ve.ui.DialogButtonTool.call( this, toolbar, config );
+};
+
+/* Inheritance */
+
+ve.inheritClass( ve.ui.MWMetaButtonTool, ve.ui.DialogButtonTool );
+
+/* Static Properties */
+
+ve.ui.MWMetaButtonTool.static.name = 'mwMeta';
+
+ve.ui.MWMetaButtonTool.static.icon = 'settings';
+
+ve.ui.MWMetaButtonTool.static.titleMessage =
'visualeditor-dialogbutton-meta-tooltip';
+
+ve.ui.MWMetaButtonTool.static.dialog = 'mwMeta';
+
+/* Registration */
+
+ve.ui.toolFactory.register( 'mwMeta', ve.ui.MWMetaButtonTool );
--
To view, visit https://gerrit.wikimedia.org/r/65303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf63329a53bcd8043d46315239c19be4e681a18a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
