Merge "debug: Allow the DBQuery channel to be used"

[lhc/web/wiklou.git] / resources / src / mediawiki.rcfilters / ui / mw.rcfilters.ui.ChangesListWrapperWidget.js

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 94b2505..c102e59 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -1,4 +1,4 @@
-( function ( mw ) {
+( function () {
        /**
         * List of changes
         *
@@ -29,13 +29,11 @@
                this.changesListViewModel = changesListViewModel;
                this.controller = controller;
                this.highlightClasses = null;
-               this.filtersModelInitialized = false;
 
                // Events
                this.filtersViewModel.connect( this, {
                        itemUpdate: 'onItemUpdate',
-                       highlightChange: 'onHighlightChange',
-                       initialize: 'onFiltersModelInitialize'
+                       highlightChange: 'onHighlightChange'
                } );
                this.changesListViewModel.connect( this, {
                        invalidate: 'onModelInvalidate',
@@ -54,13 +52,6 @@
 
        OO.inheritClass( mw.rcfilters.ui.ChangesListWrapperWidget, OO.ui.Widget );
 
-       /**
-        * Respond to filters model initialize event
-        */
-       mw.rcfilters.ui.ChangesListWrapperWidget.prototype.onFiltersModelInitialize = function () {
-               this.filtersModelInitialized = true;
-       };
-
        /**
         * Get all available highlight classes
         *
@@ -94,7 +85,9 @@
         * Respond to a filter item model update
         */
        mw.rcfilters.ui.ChangesListWrapperWidget.prototype.onItemUpdate = function () {
-               if ( this.filtersModelInitialized && this.filtersViewModel.isHighlightEnabled() ) {
+               if ( this.controller.isInitialized() && this.filtersViewModel.isHighlightEnabled() ) {
+                       // this.controller.isInitialized() is still false during page load,
+                       // we don't want to clear/apply highlights at this stage.
                        this.clearHighlight();
                        this.applyHighlight();
                }
@@ -387,4 +380,4 @@
                // Turn off highlights
                this.$element.removeClass( 'mw-rcfilters-ui-changesListWrapperWidget-highlighted' );
        };
-}( mediaWiki ) );
+}() );