From: Ed Sanders <esanders@wikimedia.org>
Date: Fri, 12 Apr 2019 20:25:42 +0000 (+0100)
Subject: Rename un-prefixed rcfilters selectors
X-Git-Tag: 1.34.0-rc.0~1957^2
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=3266b126f19a74bd9079b97abbdf029329ce4c33

Rename un-prefixed rcfilters selectors

Only -head and -container have on-wiki usage, so
keep deprecated aliases for those.

Bug: T220852
Change-Id: I67b120d67fbbdf108da98ddfc7eae24e668bfe11
---

diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php
index c8f65c1bcb..d0846b3068 100644
--- a/includes/specials/SpecialRecentChanges.php
+++ b/includes/specials/SpecialRecentChanges.php
@@ -515,15 +515,16 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		if ( $this->isStructuredFilterUiEnabled() ) {
 			$rcfilterContainer = Html::element(
 				'div',
-				[ 'class' => 'rcfilters-container' ]
+				// TODO: Remove deprecated rcfilters-container class
+				[ 'class' => 'rcfilters-container mw-rcfilters-container' ]
 			);
 
 			$loadingContainer = Html::rawElement(
 				'div',
-				[ 'class' => 'rcfilters-spinner' ],
+				[ 'class' => 'mw-rcfilters-spinner' ],
 				Html::element(
 					'div',
-					[ 'class' => 'rcfilters-spinner-bounce' ]
+					[ 'class' => 'mw-rcfilters-spinner-bounce' ]
 				)
 			);
 
@@ -531,7 +532,8 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			$this->getOutput()->addHTML(
 				Html::rawElement(
 					'div',
-					[ 'class' => 'rcfilters-head' ],
+					// TODO: Remove deprecated rcfilters-head class
+					[ 'class' => 'rcfilters-head mw-rcfilters-head' ],
 					$rcfilterContainer . $rcoptions
 				)
 			);
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 6defc9de4f..c6d9fc735d 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -699,15 +699,16 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		if ( $this->isStructuredFilterUiEnabled() ) {
 			$rcfilterContainer = Html::element(
 				'div',
-				[ 'class' => 'rcfilters-container' ]
+				// TODO: Remove deprecated rcfilters-container class
+				[ 'class' => 'rcfilters-container mw-rcfilters-container' ]
 			);
 
 			$loadingContainer = Html::rawElement(
 				'div',
-				[ 'class' => 'rcfilters-spinner' ],
+				[ 'class' => 'mw-rcfilters-spinner' ],
 				Html::element(
 					'div',
-					[ 'class' => 'rcfilters-spinner-bounce' ]
+					[ 'class' => 'mw-rcfilters-spinner-bounce' ]
 				)
 			);
 
@@ -715,7 +716,8 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 			$this->getOutput()->addHTML(
 				Html::rawElement(
 					'div',
-					[ 'class' => 'rcfilters-head' ],
+					// TODO: Remove deprecated rcfilters-head class
+					[ 'class' => 'rcfilters-head mw-rcfilters-head' ],
 					$rcfilterContainer . $form
 				)
 			);
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 4e5e0fe721..0ba75fb256 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -105,7 +105,7 @@ function init() {
 		{
 			$wrapper: $( 'body' ),
 			$topSection: $topSection,
-			$filtersContainer: $( '.rcfilters-container' ),
+			$filtersContainer: $( '.mw-rcfilters-container' ),
 			$changesListContainer: $( '.mw-changeslist, .mw-changeslist-empty' ),
 			$formContainer: $initialFieldset,
 			collapsed: initialCollapsedState
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index bc558a51b3..d3fce467f3 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -2,8 +2,6 @@
 @import 'mediawiki.ui/variables';
 @import 'mw.rcfilters.mixins';
 
-/* stylelint-disable selector-class-pattern */
-
 @rcfilters-spinner-size: 12px;
 @rcfilters-head-min-height: 210px;
 @rcfilters-head-margin-bottom: 20px;
@@ -13,28 +11,29 @@
 
 // Corrections for the standard special page
 .client-js {
+	/* stylelint-disable-next-line selector-class-pattern */
 	.cloptions {
 		border: 0;
 	}
 
 	// Reserve space for the UI while it loads
-	.rcfilters-head {
+	.mw-rcfilters-head {
 		min-height: @rcfilters-head-min-height;
 		margin-bottom: @rcfilters-head-margin-bottom;
 	}
 
 	// On the watchlist, reserve a bit more
-	.mw-special-Watchlist .rcfilters-head {
+	.mw-special-Watchlist .mw-rcfilters-head {
 		min-height: @rcfilters-wl-head-min-height;
 	}
 
 	.mw-rcfilters-collapsed {
-		.rcfilters-head {
+		.mw-rcfilters-head {
 			min-height: @rcfilters-head-min-height-collapsed;
 		}
 
 		// On the watchlist, reserve a bit more
-		&.mw-special-Watchlist .rcfilters-head {
+		&.mw-special-Watchlist .mw-rcfilters-head {
 			min-height: @rcfilters-wl-head-min-height-collapsed;
 		}
 	}
@@ -73,10 +72,11 @@
 			}
 		}
 
-		.rcfilters-head {
+		.mw-rcfilters-head {
 			opacity: 0.5;
 			pointer-events: none;
 
+			/* stylelint-disable-next-line selector-class-pattern */
 			.cloptions {
 				display: none;
 			}
@@ -100,6 +100,7 @@
 		display: none;
 	}
 
+	/* stylelint-disable-next-line selector-class-pattern */
 	.errorbox {
 		display: none;
 	}
@@ -108,7 +109,7 @@
 		opacity: 0.5;
 	}
 
-	.rcfilters-spinner {
+	.mw-rcfilters-spinner {
 		display: none;
 		position: absolute;
 		left: 50%;
@@ -116,7 +117,7 @@
 		margin-left: -3 * @rcfilters-spinner-size / 2;
 		white-space: nowrap;
 
-		& .rcfilters-spinner-bounce,
+		& .mw-rcfilters-spinner-bounce,
 		&:before,
 		&:after {
 			content: '';
@@ -140,13 +141,13 @@
 		}
 	}
 
-	body:not( .mw-rcfilters-ui-initialized ) .rcfilters-spinner {
+	body:not( .mw-rcfilters-ui-initialized ) .mw-rcfilters-spinner {
 		display: block;
 		// When initializing, display the spinner on top of the area where the UI will appear
 		margin-top: -( @rcfilters-head-min-height + @rcfilters-head-margin-bottom ) / 1.5;
 	}
 
-	body.mw-rcfilters-ui-loading .rcfilters-spinner {
+	body.mw-rcfilters-ui-loading .mw-rcfilters-spinner {
 		display: block;
 		// When loading new results, display the spinner on top of the results area
 		margin-top: -( @rcfilters-head-min-height + @rcfilters-head-margin-bottom ) / 8;
@@ -166,6 +167,7 @@
 
 	// Make the watchlist-details message display while loading, but make it not take up any
 	// space. This makes the min-height trick work better.
+	/* stylelint-disable-next-line selector-class-pattern */
 	.watchlistDetails {
 		float: left;
 		// The 20em should match the min-width we are setting up