Mooeypoo has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/341457 )
Change subject: RCFilters UI: Add 'highlight' icon to highlight button ...................................................................... RCFilters UI: Add 'highlight' icon to highlight button Bug: T149467 Change-Id: Iba11de7ba47e41046631dbf16f464f8bd3820811 Depends-On: I0b5adaaec52f9cc01c3dfb6262adaf2da368476e --- M resources/Resources.php M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js 3 files changed, 10 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/57/341457/1 diff --git a/resources/Resources.php b/resources/Resources.php index 67a3de5..c00a1ba 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1853,6 +1853,7 @@ 'mediawiki.rcfilters.filters.dm', 'oojs-ui.styles.icons-moderation', 'oojs-ui.styles.icons-editing-core', + 'oojs-ui.styles.icons-editing-styling', 'oojs-ui.styles.icons-interactions', ], ], diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less index 0f30137..198f599 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterItemHighlightButton.less @@ -1,11 +1,6 @@ @import 'mw.rcfilters.mixins'; .mw-rcfilters-ui-filterItemHighlightButton { - .oo-ui-iconElement-icon.oo-ui-icon-highlight { - /* @embed */ - background-image: url( ../images/marker-ltr.svg ); - } - .oo-ui-buttonWidget.oo-ui-popupButtonWidget .oo-ui-buttonElement-button > &-circle { display: inline-block; vertical-align: middle; diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js index cefe749..4011e6d 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FiltersListWidget.js @@ -29,7 +29,8 @@ this.groups = {}; this.selected = null; - this.highlightButton = new OO.ui.ButtonWidget( { + this.highlightButton = new OO.ui.ToggleButtonWidget( { + icon: 'highlight', label: mw.message( 'rcfilters-highlightbutton-title' ).text(), classes: [ 'mw-rcfilters-ui-filtersListWidget-hightlightButton' ] } ); @@ -43,7 +44,7 @@ this.highlightButton.connect( this, { click: 'onHighlightButtonClick' } ); this.model.connect( this, { initialize: 'onModelInitialize', - highlightChange: 'onHighlightChange' + highlightChange: 'onModelHighlightChange' } ); // Initialize @@ -109,7 +110,12 @@ ); }; - mw.rcfilters.ui.FiltersListWidget.prototype.onHighlightChange = function ( highlightEnabled ) { + /** + * Respond to model highlight change event + * + * @param {boolean} highlightEnabled Highlight is enabled + */ + mw.rcfilters.ui.FiltersListWidget.prototype.onModelHighlightChange = function ( highlightEnabled ) { this.highlightButton.setActive( highlightEnabled ); }; -- To view, visit https://gerrit.wikimedia.org/r/341457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba11de7ba47e41046631dbf16f464f8bd3820811 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Mooeypoo <mor...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits