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

[Sbisson (Code Review)]

Sbisson has uploaded a new change for review. ( 
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, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/09/382009/1

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..783f62d 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemHighlightButton.js
@@ -40,6 +40,8 @@
                // button
                this.$element.on( 'mousedown', function ( e ) { 
e.stopPropagation(); } );
 
+               this.onModelUpdate();
+
                this.$element
                        .addClass( 'mw-rcfilters-ui-filterItemHighlightButton' 
);
        };
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..41059ce 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,12 +39,13 @@
                        } ),
                        classes: 
'mw-rcfilters-ui-highlightColorPickerWidget-buttonSelect'
                } );
-               this.selectColor( 'none' );
 
                // Event
                this.model.connect( this, { update: 'onModelUpdate' } );
                this.buttonSelect.connect( this, { choose: 'onChooseColor' } );
 
+               this.onModelUpdate();
+
                this.$element
                        .addClass( 'mw-rcfilters-ui-highlightColorPickerWidget' 
)
                        .append(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idea7e09152e3176084f0634d24615a79364d77bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Sbisson <sbis...@wikimedia.org>

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