Merge "Fix \n handling for HTMLUsersMultiselectField"

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / ui / mw.rcfilters.ui.FilterMenuHeaderWidget.js

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
index b8b68a7..0138884 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js
@@ -25,6 +25,15 @@
                                .addClass( 'mw-rcfilters-ui-filterMenuHeaderWidget-title' )
                }, config ) );
 
+               // "Back" to default view button
+               this.backButton = new OO.ui.ButtonWidget( {
+                       icon: 'previous',
+                       framed: false,
+                       title: mw.msg( 'rcfilters-filterlist-title' ),
+                       classes: [ 'mw-rcfilters-ui-filterMenuHeaderWidget-backButton' ]
+               } );
+               this.backButton.toggle( this.model.getCurrentView() !== 'default' );
+
                // Highlight button
                this.highlightButton = new OO.ui.ToggleButtonWidget( {
                        icon: 'highlight',
@@ -41,6 +50,7 @@
                this.invertNamespacesButton.toggle( this.model.getCurrentView() === 'namespaces' );
 
                // Events
+               this.backButton.connect( this, { click: 'onBackButtonClick' } );
                this.highlightButton
                        .connect( this, { click: 'onHighlightButtonClick' } );
                this.invertNamespacesButton
@@ -62,6 +72,10 @@
                                                $( '<div>' )
                                                        .addClass( 'mw-rcfilters-ui-row' )
                                                        .append(
+                                                               $( '<div>' )
+                                                                       .addClass( 'mw-rcfilters-ui-cell' )
+                                                                       .addClass( 'mw-rcfilters-ui-filterMenuHeaderWidget-header-back' )
+                                                                       .append( this.backButton.$element ),
                                                                $( '<div>' )
                                                                        .addClass( 'mw-rcfilters-ui-cell' )
                                                                        .addClass( 'mw-rcfilters-ui-filterMenuHeaderWidget-header-title' )
@@ -90,9 +104,12 @@
         * Respond to model update event
         */
        mw.rcfilters.ui.FilterMenuHeaderWidget.prototype.onModelUpdate = function () {
-               this.setLabel( this.model.getCurrentViewLabel() );
+               var currentView = this.model.getCurrentView();
 
-               this.invertNamespacesButton.toggle( this.model.getCurrentView() === 'namespaces' );
+               this.setLabel( this.model.getViewTitle( currentView ) );
+
+               this.invertNamespacesButton.toggle( currentView === 'namespaces' );
+               this.backButton.toggle( currentView !== 'default' );
        };
 
        /**
@@ -113,6 +130,10 @@
                this.invertNamespacesButton.setActive( isInverted );
        };
 
+       mw.rcfilters.ui.FilterMenuHeaderWidget.prototype.onBackButtonClick = function () {
+               this.controller.switchView( 'default' );
+       };
+
        /**
         * Respond to highlight button click
         */