From: petarpetkovic <ppetkovic@wikimedia.org>
Date: Tue, 5 Dec 2017 12:56:58 +0000 (+0100)
Subject: Cleanup live update feature flag and FilterWrapperWidget
X-Git-Tag: 1.31.0-rc.0~998^2
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_user_edit%27%2C%20iduser=user.userid%29%20%7D%7D?a=commitdiff_plain;h=6ead99f1e777c52da30ba5de45fa93130f0f4473;p=lhc%2Fweb%2Fwiklou.git

Cleanup live update feature flag and FilterWrapperWidget

- Remove liveUpdate feature flag, as the flag only became alias for
getting the polling rate from config and checking that polling rate
whether to enable UI button and schedule live updates.
- Cleanup after joining two buttons into one ChangesLimitAndDateButtonWidget.

Change-Id: Ib5457ff453722211a893ac5dd6d54175ca810efa
---

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
index 466b7c05f7..c62d6f25ab 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
@@ -44,9 +44,6 @@
 
 				return result;
 			}
-		},
-		featureFlags: {
-			liveUpdate: mw.config.get( 'StructuredChangeFiltersLiveUpdatePollingRate' )
 		}
 	};
 }( mediaWiki ) );
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
index 6be6968271..c10011c262 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
@@ -32,7 +32,7 @@
 		} );
 
 		this.$element
-			.addClass( 'mw-rcfilters-ui-changesLimitButtonWidget' );
+			.addClass( 'mw-rcfilters-ui-changesLimitAndDateButtonWidget' );
 	};
 
 	/* Initialization */
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index 1cd7befe6d..dba24fc06a 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -43,7 +43,7 @@
 			this.changesListModel
 		);
 
-		this.numChangesWidget = new mw.rcfilters.ui.ChangesLimitAndDateButtonWidget(
+		this.numChangesAndDateWidget = new mw.rcfilters.ui.ChangesLimitAndDateButtonWidget(
 			this.controller,
 			this.model,
 			{
@@ -59,6 +59,12 @@
 			classes: [ 'mw-rcfilters-ui-filterWrapperWidget-showNewChanges' ]
 		} );
 
+		// Events
+		this.filterTagWidget.menu.connect( this, { toggle: [ 'emit', 'menuToggle' ] } );
+		this.changesListModel.connect( this, { newChangesExist: 'onNewChangesExist' } );
+		this.showNewChangesLink.connect( this, { click: 'onShowNewChangesClick' } );
+		this.showNewChangesLink.toggle( false );
+
 		// Initialize
 		this.$top = $( '<div>' )
 			.addClass( 'mw-rcfilters-ui-filterWrapperWidget-top' );
@@ -67,19 +73,13 @@
 			.addClass( 'mw-rcfilters-ui-filterWrapperWidget-bottom' )
 			.append(
 				this.showNewChangesLink.$element,
-				this.numChangesWidget.$element
+				this.numChangesAndDateWidget.$element
 			);
 
-		if ( mw.rcfilters.featureFlags.liveUpdate ) {
+		if ( mw.config.get( 'StructuredChangeFiltersLiveUpdatePollingRate' ) ) {
 			$bottom.prepend( this.liveUpdateButton.$element );
 		}
 
-		// Events
-		this.filterTagWidget.menu.connect( this, { toggle: [ 'emit', 'menuToggle' ] } );
-		this.changesListModel.connect( this, { newChangesExist: 'onNewChangesExist' } );
-		this.showNewChangesLink.connect( this, { click: 'onShowNewChangesClick' } );
-		this.showNewChangesLink.toggle( false );
-
 		this.$element
 			.addClass( 'mw-rcfilters-ui-filterWrapperWidget' )
 			.append(