jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395530 )
Change subject: Cleanup live update feature flag and FilterWrapperWidget
......................................................................
Cleanup live update feature flag and FilterWrapperWidget
- Remove liveUpdate feature flag, as the flag only became alias for
getting the polling rate from config and checking that polling rate
whether to enable UI button and schedule live updates.
- Cleanup after joining two buttons into one ChangesLimitAndDateButtonWidget.
Change-Id: Ib5457ff453722211a893ac5dd6d54175ca810efa
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.js
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
3 files changed, 10 insertions(+), 13 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
index 466b7c0..c62d6f2 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.js
@@ -44,9 +44,6 @@
return result;
}
- },
- featureFlags: {
- liveUpdate: mw.config.get(
'StructuredChangeFiltersLiveUpdatePollingRate' )
}
};
}( mediaWiki ) );
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
index 6be6968..c10011c 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesLimitAndDateButtonWidget.js
@@ -32,7 +32,7 @@
} );
this.$element
- .addClass( 'mw-rcfilters-ui-changesLimitButtonWidget' );
+ .addClass(
'mw-rcfilters-ui-changesLimitAndDateButtonWidget' );
};
/* Initialization */
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index 1cd7bef..dba24fc 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -43,7 +43,7 @@
this.changesListModel
);
- this.numChangesWidget = new
mw.rcfilters.ui.ChangesLimitAndDateButtonWidget(
+ this.numChangesAndDateWidget = new
mw.rcfilters.ui.ChangesLimitAndDateButtonWidget(
this.controller,
this.model,
{
@@ -59,6 +59,12 @@
classes: [
'mw-rcfilters-ui-filterWrapperWidget-showNewChanges' ]
} );
+ // Events
+ this.filterTagWidget.menu.connect( this, { toggle: [ 'emit',
'menuToggle' ] } );
+ this.changesListModel.connect( this, { newChangesExist:
'onNewChangesExist' } );
+ this.showNewChangesLink.connect( this, { click:
'onShowNewChangesClick' } );
+ this.showNewChangesLink.toggle( false );
+
// Initialize
this.$top = $( '<div>' )
.addClass( 'mw-rcfilters-ui-filterWrapperWidget-top' );
@@ -67,18 +73,12 @@
.addClass( 'mw-rcfilters-ui-filterWrapperWidget-bottom'
)
.append(
this.showNewChangesLink.$element,
- this.numChangesWidget.$element
+ this.numChangesAndDateWidget.$element
);
- if ( mw.rcfilters.featureFlags.liveUpdate ) {
+ if ( mw.config.get(
'StructuredChangeFiltersLiveUpdatePollingRate' ) ) {
$bottom.prepend( this.liveUpdateButton.$element );
}
-
- // Events
- this.filterTagWidget.menu.connect( this, { toggle: [ 'emit',
'menuToggle' ] } );
- this.changesListModel.connect( this, { newChangesExist:
'onNewChangesExist' } );
- this.showNewChangesLink.connect( this, { click:
'onShowNewChangesClick' } );
- this.showNewChangesLink.toggle( false );
this.$element
.addClass( 'mw-rcfilters-ui-filterWrapperWidget' )
--
To view, visit https://gerrit.wikimedia.org/r/395530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5457ff453722211a893ac5dd6d54175ca810efa
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic <ppetko...@wikimedia.org>
Gerrit-Reviewer: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: Petar.petkovic <ppetko...@wikimedia.org>
Gerrit-Reviewer: Sbisson <sbis...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
