From 6ead99f1e777c52da30ba5de45fa93130f0f4473 Mon Sep 17 00:00:00 2001
From: petarpetkovic <ppetkovic@wikimedia.org>
Date: Tue, 5 Dec 2017 13:56:58 +0100
Subject: [PATCH] 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
---
 .../src/mediawiki.rcfilters/mw.rcfilters.js    |  3 ---
 ...lters.ui.ChangesLimitAndDateButtonWidget.js |  2 +-
 .../ui/mw.rcfilters.ui.FilterWrapperWidget.js  | 18 +++++++++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

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(
-- 
2.20.1