Merge "RCFilters: Remove view triggers before checking emptiness of string"

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / dm / mw.rcfilters.dm.FiltersViewModel.js

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 d84a00a..c51791d 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -20,7 +20,7 @@
                this.parameterMap = {};
 
                this.views = {};
-               this.currentView = null;
+               this.currentView = 'default';
 
                // Events
                this.aggregate( { update: 'filterItemUpdate' } );
@@ -373,8 +373,8 @@
                        this.views.tags = { name: 'tags', label: mw.msg( 'rcfilters-view-tags' ), trigger: '#' };
 
                        // Add the group
-                       model.groups.tags = new mw.rcfilters.dm.FilterGroup(
-                               'tags',
+                       model.groups.tagfilter = new mw.rcfilters.dm.FilterGroup(
+                               'tagfilter',
                                {
                                        type: 'string_options',
                                        view: 'tags',
@@ -386,10 +386,10 @@
                        );
 
                        // Add tag items to group
-                       model.groups.tags.initializeFilters( tags );
+                       model.groups.tagfilter.initializeFilters( tags );
 
                        // Add item references to the model, for lookup
-                       items = items.concat( model.groups.tags.getItems() );
+                       items = items.concat( model.groups.tagfilter.getItems() );
                }
 
                // Add item references to the model, for lookup
@@ -496,7 +496,7 @@
         * @return {string} View trigger, if exists
         */
        mw.rcfilters.dm.FiltersViewModel.prototype.getViewTrigger = function ( view ) {
-               return this.views[ view ] && this.views[ view ].trigger;
+               return ( this.views[ view ] && this.views[ view ].trigger ) || '';
        };
        /**
         * Get the value of a specific parameter