RCFilters: Correct default view title

The key was changed from "label" to "title" but that was not changed
in the default view. Change the definition key and adjust the name
of the method so it isn't confusing.

Bug: T168855
Change-Id: Ib94f57d3bcce94a02fac25d66b893a68aa648e84

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index 37cf4dd..82cc893 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -326,7 +326,7 @@
                // Collect views
                allViews = {
                        'default': {
-                               label: mw.msg( 'rcfilters-filterlist-title' ),
+                               title: mw.msg( 'rcfilters-filterlist-title' ),
                                groups: filterGroups
                        }
                };
@@ -907,10 +907,13 @@
        /**
         * Get the label for the current view
         *
+        * @param {string} viewName View name
         * @return {string} Label for the current view
         */
-       mw.rcfilters.dm.FiltersViewModel.prototype.getCurrentViewLabel = function () {
-               return this.views[ this.getCurrentView() ].title;
+       mw.rcfilters.dm.FiltersViewModel.prototype.getViewTitle = function ( viewName ) {
+               viewName = viewName || this.getCurrentView();
+
+               return this.views[ viewName ] && this.views[ viewName ].title;
        };
 
        /**

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 fe91489..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
@@ -106,7 +106,7 @@
        mw.rcfilters.ui.FilterMenuHeaderWidget.prototype.onModelUpdate = function () {
                var currentView = this.model.getCurrentView();
 
-               this.setLabel( this.model.getCurrentViewLabel() );
+               this.setLabel( this.model.getViewTitle( currentView ) );
 
                this.invertNamespacesButton.toggle( currentView === 'namespaces' );
                this.backButton.toggle( currentView !== 'default' );