From f19764395192218455851eb5a26700ecac9b6ad6 Mon Sep 17 00:00:00 2001
From: Stephane Bisson <sbisson@wikimedia.org>
Date: Fri, 4 Aug 2017 07:41:15 -0400
Subject: [PATCH] RCFilters: Show "from" link when live update is not available

Also introduce a place for feature flags.

Change-Id: Id118b85c727a865745283ee8fabda7050f317ce1
---
 .../src/mediawiki.rcfilters/mw.rcfilters.Controller.js    | 5 +----
 resources/src/mediawiki.rcfilters/mw.rcfilters.js         | 3 +++
 .../ui/mw.rcfilters.ui.FilterWrapperWidget.js             | 6 +-----
 .../ui/mw.rcfilters.ui.FormWrapperWidget.js               | 8 +++++---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 9867220b97..f0e3bd0d97 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -542,14 +542,11 @@
 	 * @private
 	 */
 	mw.rcfilters.Controller.prototype._shouldCheckForNewChanges = function () {
-		var liveUpdateFeatureFlag = mw.config.get( 'wgStructuredChangeFiltersEnableLiveUpdate' ) ||
-			new mw.Uri().query.liveupdate;
-
 		return !document.hidden &&
 			!this.filtersModel.hasConflict() &&
 			!this.changesListModel.getNewChangesExist() &&
 			!this.updatingChangesList &&
-			liveUpdateFeatureFlag;
+			mw.rcfilters.featureFlags.liveUpdate;
 	};
 
 	/**
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
index c62d6f25ab..7bdc2a2f25 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
@@ -44,6 +44,9 @@
 
 				return result;
 			}
+		},
+		featureFlags: {
+			liveUpdate: mw.config.get( 'wgStructuredChangeFiltersEnableLiveUpdate' ) || new mw.Uri().query.liveupdate
 		}
 	};
 }( mediaWiki ) );
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 44d44595cc..8f8ca38a42 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -91,11 +91,7 @@
 				.append( this.savedLinksListWidget.$element )
 		);
 
-		if (
-			mw.config.get( 'wgStructuredChangeFiltersEnableLiveUpdate' ) ||
-			// Allow users to enable live update with ?liveupdate=1
-			new mw.Uri().query.liveupdate
-		) {
+		if ( mw.rcfilters.featureFlags.liveUpdate ) {
 			$bottom.append( this.liveUpdateButton.$element );
 		}
 
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
index 7f7bbd2364..82992fb847 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
@@ -151,9 +151,11 @@
 			this.$element.find( 'br' ).detach();
 		}
 
-		this.$element.find(
-			'legend, .rclistfrom, .rcnotefrom, .rcoptions-listfromreset'
-		).detach();
+		if ( mw.rcfilters.featureFlags.liveUpdate ) {
+			this.$element.find(
+				'legend, .rclistfrom, .rcnotefrom, .rcoptions-listfromreset'
+			).detach();
+		}
 
 		if ( this.$element.text().trim() === '' ) {
 			this.$element.detach();
-- 
2.20.1