jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Use Button for category button
......................................................................
Hygiene: Use Button for category button
Change-Id: I8de81d13132bd39bcd08bca6cbb19e50ab5a324f
---
M includes/Resources.php
M javascripts/modules/categories/CategoryLookupInputWidget.js
D templates/modules/categories/CategoryButton.hogan
3 files changed, 13 insertions(+), 10 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 076dc4e..3ad32f1 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -771,7 +771,6 @@
'CategoryAddOverlay.hogan' =>
'templates/modules/categories/CategoryAddOverlay.hogan',
'CategoryAddOverlayHeader.hogan' =>
'templates/modules/categories/CategoryAddOverlayHeader.hogan',
- 'CategoryButton.hogan' =>
'templates/modules/categories/CategoryButton.hogan',
),
'messages' => array(
'mobile-frontend-categories-heading',
diff --git a/javascripts/modules/categories/CategoryLookupInputWidget.js
b/javascripts/modules/categories/CategoryLookupInputWidget.js
index 43cb1a4..4af7a4a 100644
--- a/javascripts/modules/categories/CategoryLookupInputWidget.js
+++ b/javascripts/modules/categories/CategoryLookupInputWidget.js
@@ -1,4 +1,7 @@
( function ( M, $, OO ) {
+ var Button = M.require( 'Button' ),
+ Icon = M.require( 'Icon' );
+
/**
* @class CategoryLookupInputWidget
* @extends OO.ui.LookupElement
@@ -21,12 +24,16 @@
* @param {Object} data Data of the clicked element
*/
CategoryLookupInputWidget.prototype.onLookupMenuItemChoose = function (
data ) {
- this.$suggestions.append(
- mw.template.get( 'mobile.categories',
'CategoryButton.hogan' ).render( {
- title: data.data,
- displayname: data.label
- } )
- );
+ var button = new Button( {
+ progressive: true,
+ additionalClassNames: new Icon( {
+ name: 'ok',
+ hasText: true,
+ additionalClassNames: 'suggestion suggested'
+ } ).getClassName(),
+ label: data.label
+ } ).appendTo( this.$suggestions );
+ button.$el.data( 'title', data.data );
this.$saveButton.prop( 'disabled', false );
};
diff --git a/templates/modules/categories/CategoryButton.hogan
b/templates/modules/categories/CategoryButton.hogan
deleted file mode 100644
index ccc3623..0000000
--- a/templates/modules/categories/CategoryButton.hogan
+++ /dev/null
@@ -1,3 +0,0 @@
-<button class="mw-ui-button mw-ui-progressive mw-ui-icon mw-ui-icon-before
mw-ui-icon-ok suggestion suggested" data-title="{{title}}">
- {{displayname}}
-</button>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/206334
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8de81d13132bd39bcd08bca6cbb19e50ab5a324f
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
