From e6ccaf813a7ac96d1126f18c62e2517b51f15518 Mon Sep 17 00:00:00 2001 From: Stephane Bisson Date: Thu, 24 Aug 2017 15:47:15 -0400 Subject: [PATCH] RCFilters: Enable 'View newest' Keep the feature flag for 'live update' but enable 'view newest' by default on RC. Bug: T163426 Change-Id: I733cf99bbeb6d90d3aa21e87507c513354b81791 --- .../dm/mw.rcfilters.dm.ChangesListViewModel.js | 7 +++---- .../src/mediawiki.rcfilters/mw.rcfilters.Controller.js | 2 +- .../ui/mw.rcfilters.ui.ChangesListWrapperWidget.js | 4 +--- .../ui/mw.rcfilters.ui.FormWrapperWidget.js | 8 +++----- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js index d7042ff3c6..0155a587fd 100644 --- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js +++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.ChangesListViewModel.js @@ -79,9 +79,7 @@ mw.rcfilters.dm.ChangesListViewModel.prototype.update = function ( changesListContent, $fieldset, isInitialDOM, separateOldAndNew ) { var from = this.nextFrom; this.valid = true; - if ( mw.rcfilters.featureFlags.liveUpdate ) { - this.extractNextFrom( $fieldset ); - } + this.extractNextFrom( $fieldset ); this.checkForUnseenWatchedChanges( changesListContent ); this.emit( 'update', changesListContent, $fieldset, isInitialDOM, separateOldAndNew ? from : null ); }; @@ -112,7 +110,8 @@ * @param {jQuery} $fieldset */ mw.rcfilters.dm.ChangesListViewModel.prototype.extractNextFrom = function ( $fieldset ) { - this.nextFrom = $fieldset.find( '.rclistfrom > a' ).data( 'params' ).from; + var data = $fieldset.find( '.rclistfrom > a' ).data( 'params' ); + this.nextFrom = data ? data.from : null; }; /** diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index 9906119549..a0e60d583d 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -550,7 +550,7 @@ !this.filtersModel.hasConflict() && !this.changesListModel.getNewChangesExist() && !this.updatingChangesList && - mw.rcfilters.featureFlags.liveUpdate; + this.changesListModel.getNextFrom(); }; /** 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 955e01dd70..a97ffe93d6 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js @@ -48,9 +48,7 @@ // Set up highlight containers this.setupHighlightContainers( this.$element ); - if ( mw.rcfilters.featureFlags.liveUpdate ) { - this.setupNewChangesButtonContainer( this.$element ); - } + this.setupNewChangesButtonContainer( this.$element ); }; /* Initialization */ 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 5a64edd636..ad99e223cd 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js @@ -153,11 +153,9 @@ this.$element.find( '.cloption-submit' ).detach(); } - if ( mw.rcfilters.featureFlags.liveUpdate ) { - this.$element.find( - '.rclistfrom, .rcnotefrom, .rcoptions-listfromreset' - ).detach(); - } + this.$element.find( + '.rclistfrom, .rcnotefrom, .rcoptions-listfromreset' + ).detach(); if ( this.$element.text().trim() === this.$element.find( 'legend' ).text() ) { this.$element.detach(); -- 2.20.1