From: Moriel Schottlender Date: Wed, 26 Jul 2017 03:34:47 +0000 (-0700) Subject: RCFilters: Followup I78e23f85c3: Don't disable RCFilters system when fetching results X-Git-Tag: 1.31.0-rc.0~2581 X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=28db90b04c0e8cf555220311d0fd3a6acca486a2;p=lhc%2Fweb%2Fwiklou.git RCFilters: Followup I78e23f85c3: Don't disable RCFilters system when fetching results We disable and hide it only on first page load while we create the system, but should not hide and disable the actual filter area system. Bug: T165286 Bug: T171671 Change-Id: Ifc9d3c02c0c118d48634b8df846e14bfa6ea294a --- diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js index 4263c5182f..e758f26fcd 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js @@ -36,6 +36,7 @@ $( '.rcfilters-container' ).append( filtersWidget.$element ); $( 'body' ).append( $overlay ); + $( '.rcfilters-head' ).addClass( 'mw-rcfilters-ui-ready' ); $( 'a.mw-helplink' ).attr( 'href', 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 37dda4d469..c2533df818 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js @@ -76,7 +76,6 @@ * Respond to changes list model invalidate */ mw.rcfilters.ui.ChangesListWrapperWidget.prototype.onModelInvalidate = function () { - $( '.rcfilters-head' ).removeClass( 'mw-rcfilters-ui-ready' ); $( '.rcfilters-spinner' ).removeClass( 'mw-rcfilters-ui-ready' ); this.$element.removeClass( 'mw-rcfilters-ui-ready' ); }; @@ -138,7 +137,6 @@ } } - $( '.rcfilters-head' ).addClass( 'mw-rcfilters-ui-ready' ); $( '.rcfilters-spinner' ).addClass( 'mw-rcfilters-ui-ready' ); this.$element.addClass( 'mw-rcfilters-ui-ready' ); }; diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js index 04ccaf6d3e..ee8e0bc1b9 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js @@ -87,6 +87,7 @@ */ mw.rcfilters.ui.FormWrapperWidget.prototype.onChangesModelInvalidate = function () { this.$submitButton.prop( 'disabled', true ); + this.$element.removeClass( 'mw-rcfilters-ui-ready' ); }; /** @@ -99,6 +100,7 @@ */ mw.rcfilters.ui.FormWrapperWidget.prototype.onChangesModelUpdate = function ( $changesList, $fieldset, isInitialDOM ) { this.$submitButton.prop( 'disabled', false ); + this.$element.removeClass( 'mw-rcfilters-ui-ready' ); // Replace the entire fieldset this.$element.empty().append( $fieldset.contents() );