From: Moriel Schottlender <moriel@gmail.com>
Date: Mon, 29 May 2017 09:49:17 +0000 (+0300)
Subject: RCFilters: Hide server-side 'empty results' message
X-Git-Tag: 1.31.0-rc.0~3091^2
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=a6aefd5629ae8103d943f472fe520eb68f1acd4a;p=lhc%2Fweb%2Fwiklou.git

RCFilters: Hide server-side 'empty results' message

RCFilters uses its own empty-results message that also relates to
the reason of why the results are empty (in case of conflicts, etc).
We want to make sure the server-side message is hidden and gone
while we load, and manage the empty-results message ourselves.

Bug: T163577
Change-Id: I1d0f07068653f369dea181f5c4f9964fd6d7cd58
---

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index d47346c14d..844e41c656 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -26,6 +26,13 @@
 		min-height: 100px;
 		margin: 0;
 	}
+
+	.mw-changeslist-empty {
+		// Hide the 'empty' message when we load rcfilters
+		// since we replace it anyways with a specific
+		// message of our own
+		display: none;
+	}
 }
 
 .mw-rcfilters-staticfilters-selected {
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index f4a1807494..c7754be719 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -39,7 +39,10 @@
 			update: 'onModelUpdate'
 		} );
 
-		this.$element.addClass( 'mw-rcfilters-ui-changesListWrapperWidget' );
+		this.$element
+			.addClass( 'mw-rcfilters-ui-changesListWrapperWidget' )
+			// We handle our own display/hide of the empty results message
+			.removeClass( 'mw-changeslist-empty' );
 
 		// Set up highlight containers
 		this.setupHighlightContainers( this.$element );
@@ -92,7 +95,6 @@
 			isEmpty = $changesListContent === 'NO_RESULTS';
 
 		this.$element.toggleClass( 'mw-changeslist', !isEmpty );
-		this.$element.toggleClass( 'mw-changeslist-empty', isEmpty );
 		if ( isEmpty ) {
 			this.$changesListContent = null;
 			this.$element.empty();