jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Removed unused formElement handlebars helper
......................................................................
Hygiene: Removed unused formElement handlebars helper
Change-Id: I0ace768e11305cb08cf9f787b5e2d5d44e3fd34a
---
M includes/TemplateHelper.php
M modules/new/flow-handlebars.js
2 files changed, 0 insertions(+), 138 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/TemplateHelper.php b/includes/TemplateHelper.php
index 3732594..a16787a 100644
--- a/includes/TemplateHelper.php
+++ b/includes/TemplateHelper.php
@@ -136,7 +136,6 @@
'block' => 'Flow\TemplateHelper::block',
'author' =>
'Flow\TemplateHelper::author',
'url' => 'Flow\TemplateHelper::url',
- 'formElement' =>
'Flow\TemplateHelper::formElement',
'math' => 'Flow\TemplateHelper::math',
'post' => 'Flow\TemplateHelper::post',
'progressiveEnhancement' =>
'Flow\TemplateHelper::progressiveEnhancement',
@@ -443,12 +442,6 @@
// Return the resulting HTML
return implode( '', $html );
- }
-
- /**
- * @todo
- */
- static public function formElement() {
}
/**
diff --git a/modules/new/flow-handlebars.js b/modules/new/flow-handlebars.js
index 00563ca..db820a8 100644
--- a/modules/new/flow-handlebars.js
+++ b/modules/new/flow-handlebars.js
@@ -446,136 +446,6 @@
};
/**
- * Creates a form element based on the given input.
- * Automatically applies mw-ui-button classes and creates sibling mw-ui
nodes.
- * Takes option keys:
- * * String: content, role, pattern, name, value, placeholder
- * * Bool: required, collapsible, expandable
- * * Number: maxlength, min, max, step, rows, cols
- * @example {{formElement this "button" class="mw-ui-sleeper"
text='{{l10n "Preview"}}'}}
- * @param {Object} context
- * @param {String} type
- * @param {Object} options
- * @returns {String}
- */
- FlowHandlebars.prototype.formElement = function ( context, type,
options ) {
- var hash = options.hash,
- data = {
- tag: type,
- fieldtype: null,
- closing_tag: null,
- 'class': hash['class'] || '',
- required: !!hash.required,
- maxlength: hash.maxlength,
- pattern: hash.pattern,
- name: hash.name,
- value: hash.value,
- content: hash.content,
- role: hash.role || type,
- collapsible: !!hash.collapsible,
- expandable: !!hash.expandable,
- radio: false,
- checkbox: false
- };
-
- switch ( type ) {
- case 'submit':
- case 'reset':
- case 'button':
- data.tag = 'button';
- data.closing_tag = data.tag;
-
- // Apply mw-ui- class based on role (or type if
role is omitted)
- switch ( hash.role || type ) {
- case 'submit':
- case 'constructive':
- data.fieldtype = 'constructive';
- break;
-
- case 'action':
- case 'progressive':
- data.fieldtype = 'progressive';
- break;
-
- case 'regressive':
- data.fieldtype = 'regressive';
- break;
-
- case 'cancel':
- case 'reset':
- case 'destructive':
- data.fieldtype = 'destructive';
- break;
-
- default:
- data.fieldtype = 'button';
- break;
- }
-
- if ( data.fieldtype !== 'button' ) {
- data['class'] = 'flow-ui-' +
data.fieldtype + ' ' + data['class'];
- }
- data['class'] = 'flow-ui-button ' +
data['class'];
- break;
-
- case 'color':
- case 'date':
- case 'email':
- case 'number':
- case 'url':
- case 'range':
- case 'time':
- data.validation = true;
- /* fall through */
- case 'search':
- case 'text':
- case 'input':
- data.tag = 'input';
- data.fieldtype = type === 'input' ? 'text' :
type;
- data.validation = data.validation ||
data.required || data.min || data.max;
- data.type = type === 'input' ? 'text' : type;
- if ( type !== 'color' && type !== 'range' ) {
- // These are NOT styled correctly yet
- data['class'] = 'mw-ui-input ' +
data['class'];
- }
- data.min = hash.min;
- data.max = hash.max;
- data.step = hash.step;
- break;
-
- case 'textarea':
- data.closing_tag = data.tag;
- data['class'] = 'mw-ui-input ' + data['class'];
- data.validation = true;
- data.rows = hash.rows;
- data.cols = hash.cols;
- break;
-
- case 'radio':
- case 'checkbox':
- data.tag = 'input';
- data.type = type;
- data.fieldtype = type;
- data.radio = type === 'radio';
- data.checkbox = type === 'checkbox';
- data.validation = true;
- if ( data.content ) {
- data.content = ' ' + data.content;
- }
- break;
-
- default:
- break;
- }
-
- if ( hash.placeholder ) {
- data.placeholder = Handlebars.compile( hash.placeholder
)( context, options );
- }
-
- return FlowHandlebars.prototype.html(
FlowHandlebars.prototype.processTemplate( 'form_element', data ) );
- };
-
- /**
*
* @example {{generateUID}}
* @returns {String}
@@ -759,7 +629,6 @@
Handlebars.registerHelper( 'post', FlowHandlebars.prototype.postBlock );
Handlebars.registerHelper( 'eachPost',
FlowHandlebars.prototype.eachPost );
Handlebars.registerHelper( 'url', FlowHandlebars.prototype.url );
- Handlebars.registerHelper( 'formElement',
FlowHandlebars.prototype.formElement );
Handlebars.registerHelper( 'generateUID',
FlowHandlebars.prototype.generateUID );
Handlebars.registerHelper( 'math', FlowHandlebars.prototype.math );
Handlebars.registerHelper( 'progressiveEnhancement',
FlowHandlebars.prototype.progressiveEnhancement );
--
To view, visit https://gerrit.wikimedia.org/r/140957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ace768e11305cb08cf9f787b5e2d5d44e3fd34a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: frontend-rewrite
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
