jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356025 )
Change subject: RCFilters: Hide server-side 'empty results' message
......................................................................
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
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
2 files changed, 11 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index d47346c..844e41c 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 f4a1807..c7754be 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();
--
To view, visit https://gerrit.wikimedia.org/r/356025
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d0f07068653f369dea181f5c4f9964fd6d7cd58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <mor...@gmail.com>
Gerrit-Reviewer: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
