[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Init highlight button based on model state

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/382009 )

Change subject: RCFilters: Init highlight button based on model state
......................................................................


RCFilters: Init highlight button based on model state

Bug: T177028
Change-Id: Idea7e09152e3176084f0634d24615a79364d77bb
---
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
M 
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
2 files changed, 9 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Mooeypoo: Looks good to me, approved



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
index 7426123..c840d7c 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
@@ -33,12 +33,14 @@
                this.model = model;
 
                // Event
-               this.model.connect( this, { update: 'onModelUpdate' } );
+               this.model.connect( this, { update: 'updateUiBasedOnModel' } );
                this.colorPickerWidget.connect( this, { chooseColor: 
'onChooseColor' } );
                // This lives inside a MenuOptionWidget, which intercepts 
mousedown
                // to select the item. We want to prevent that when we click 
the highlight
                // button
                this.$element.on( 'mousedown', function ( e ) { 
e.stopPropagation(); } );
+
+               this.updateUiBasedOnModel();
 
                this.$element
                        .addClass( 'mw-rcfilters-ui-filterItemHighlightButton' 
);
@@ -60,7 +62,7 @@
        /**
         * Respond to item model update event
         */
-       mw.rcfilters.ui.FilterItemHighlightButton.prototype.onModelUpdate = 
function () {
+       
mw.rcfilters.ui.FilterItemHighlightButton.prototype.updateUiBasedOnModel = 
function () {
                var currentColor = this.model.getHighlightColor(),
                        widget = this;
 
diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
index 570647e..ad3b304 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.HighlightColorPickerWidget.js
@@ -24,7 +24,7 @@
                this.controller = controller;
                this.model = model;
 
-               this.currentSelection = '';
+               this.currentSelection = 'none';
                this.buttonSelect = new OO.ui.ButtonSelectWidget( {
                        items: colors.map( function ( color ) {
                                return new OO.ui.ButtonOptionWidget( {
@@ -39,11 +39,12 @@
                        } ),
                        classes: 
'mw-rcfilters-ui-highlightColorPickerWidget-buttonSelect'
                } );
-               this.selectColor( 'none' );
 
                // Event
-               this.model.connect( this, { update: 'onModelUpdate' } );
+               this.model.connect( this, { update: 'updateUiBasedOnModel' } );
                this.buttonSelect.connect( this, { choose: 'onChooseColor' } );
+
+               this.updateUiBasedOnModel();
 
                this.$element
                        .addClass( 'mw-rcfilters-ui-highlightColorPickerWidget' 
)
@@ -73,7 +74,7 @@
        /**
         * Respond to item model update event
         */
-       mw.rcfilters.ui.HighlightColorPickerWidget.prototype.onModelUpdate = 
function () {
+       
mw.rcfilters.ui.HighlightColorPickerWidget.prototype.updateUiBasedOnModel = 
function () {
                this.selectColor( this.model.getHighlightColor() || 'none' );
        };
 

-- 
To view, visit https://gerrit.wikimedia.org/r/382009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Idea7e09152e3176084f0634d24615a79364d77bb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson <sbis...@wikimedia.org>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Mooeypoo <mor...@gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits