Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/107412
Change subject: Display indicators for required parameters in template dialog
......................................................................
Display indicators for required parameters in template dialog
Depends on changes in OOUI (I1c047b55c7a0d5cf3e0aa0cc3f9a4da7d45c0304)
Change-Id: I8f84a9ae277e5093356f591f7a56e8cebf4a1893
---
M VisualEditor.php
M lib/ve
M modules/ve-mw/dm/models/ve.dm.MWTemplateParameterModel.js
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
6 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/12/107412/1
diff --git a/VisualEditor.php b/VisualEditor.php
index 26d0ab8..bb0adc5 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -669,6 +669,7 @@
'visualeditor-dialog-transclusion-remove-content',
'visualeditor-dialog-transclusion-remove-param',
'visualeditor-dialog-transclusion-remove-template',
+ 'visualeditor-dialog-transclusion-required-parameter',
'visualeditor-dialog-transclusion-title',
'visualeditor-dialog-transclusion-wikitext-label',
'visualeditor-dialogbutton-media-tooltip',
diff --git a/lib/ve b/lib/ve
index 677574c..7c220a4 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 677574cc70b0107d4c5b984fe8198c63ff53d651
+Subproject commit 7c220a4c627ae77fb8bd7d9637e82ab3f0f10cfb
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTemplateParameterModel.js
b/modules/ve-mw/dm/models/ve.dm.MWTemplateParameterModel.js
index 8924bdb..cc03bc9 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTemplateParameterModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTemplateParameterModel.js
@@ -27,6 +27,17 @@
/* Methods */
/**
+ * Check if parameter is required.
+ *
+ * @method
+ * @param {string} name Parameter name
+ * @returns {boolean} Parameter is required
+ */
+ve.dm.MWTemplateParameterModel.prototype.isRequired = function () {
+ return this.template.getSpec().isParameterRequired( this.name );
+};
+
+/**
* Get template parameter is part of.
*
* @method
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 68999d8..2c36ce6 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -83,6 +83,7 @@
"visualeditor-dialog-transclusion-remove-content": "Remove content",
"visualeditor-dialog-transclusion-remove-param": "Remove parameter",
"visualeditor-dialog-transclusion-remove-template": "Remove template",
+ "visualeditor-dialog-transclusion-required-parameter": "Required
parameter",
"visualeditor-dialog-transclusion-title": "Transclusion",
"visualeditor-dialogbutton-media-tooltip": "Media",
"visualeditor-dialogbutton-meta-tooltip": "Page settings",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index c414fed..e03f098 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -88,6 +88,7 @@
"visualeditor-dialog-transclusion-remove-content": "Label for button that
removes content between transclusion parts",
"visualeditor-dialog-transclusion-remove-param": "Label for button that
removes a parameter from a template",
"visualeditor-dialog-transclusion-remove-template": "Label for button that
removes a template from a transclusion.\n{{Identical|Remove template}}",
+ "visualeditor-dialog-transclusion-required-parameter": "Tooltip for
required parameter indicator",
"visualeditor-dialog-transclusion-title": "{{Identical|Transclusion}}",
"visualeditor-dialogbutton-media-tooltip": "{{Identical|Media}}",
"visualeditor-dialogbutton-meta-tooltip": "{{Identical|Page settings}}",
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
index 568c77a..f069518 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
@@ -20,6 +20,11 @@
// Configuration initialization
config = ve.extendObject( { 'icon': 'parameter', 'movable': false,
'level': 1 }, config );
+ if ( parameter.isRequired() ) {
+ config.indicator = 'required';
+ config.indicatorLabel = ve.msg(
'visualeditor-dialog-transclusion-required-parameter' );
+ }
+
// Parent constructor
OO.ui.PageLayout.call( this, name, config );
--
To view, visit https://gerrit.wikimedia.org/r/107412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f84a9ae277e5093356f591f7a56e8cebf4a1893
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
