Merge "RCFilters: Hide server-side 'empty results' message"

diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index d47346c..844e41c 100644 (file)
--- 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 (file)
--- 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();