From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Wed, 26 Jul 2017 00:40:47 +0000 (-0700)
Subject: RCFilters UI: Unbreak limit and days widgets in non-experimental mode
X-Git-Tag: 1.31.0-rc.0~2585^2
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=b9a71fb0e3b75244ed132c27734f2dc86973e6fe;p=lhc%2Fweb%2Fwiklou.git

RCFilters UI: Unbreak limit and days widgets in non-experimental mode

Don't treat all views as experimental, only the namespace and tag ones.

Change-Id: I1ec014314217b52cdfd71ccfcf10d549bea55f6c
---

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 a602c32d2b..3281735bfb 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -324,17 +324,12 @@
 		} );
 
 		// Collect views
-		allViews = {
+		allViews = $.extend( true, {
 			'default': {
 				title: mw.msg( 'rcfilters-filterlist-title' ),
 				groups: filterGroups
 			}
-		};
-
-		if ( views && mw.config.get( 'wgStructuredChangeFiltersEnableExperimentalViews' ) ) {
-			// If we have extended views, add them in
-			$.extend( true, allViews, views );
-		}
+		}, views );
 
 		// Go over all views
 		$.each( allViews, function ( viewName, viewData ) {
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 5ebec27164..3b8ebbd89d 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -35,6 +35,7 @@
 			items = [],
 			uri = new mw.Uri(),
 			$changesList = $( '.mw-changeslist' ).first().contents(),
+			experimentalViews = mw.config.get( 'wgStructuredChangeFiltersEnableExperimentalViews' ),
 			createFilterDataFromNumber = function ( num, convertedNumForLabel ) {
 				return {
 					name: String( num ),
@@ -43,7 +44,7 @@
 			};
 
 		// Prepare views
-		if ( namespaceStructure ) {
+		if ( namespaceStructure && experimentalViews ) {
 			items = [];
 			$.each( namespaceStructure, function ( namespaceID, label ) {
 				// Build and clean up the individual namespace items definition
@@ -74,7 +75,7 @@
 				} ]
 			};
 		}
-		if ( tagList ) {
+		if ( tagList && experimentalViews ) {
 			views.tags = {
 				title: mw.msg( 'rcfilters-view-tags' ),
 				trigger: '#',