jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368329 )
Change subject: RCFilters: Make namespace and tag features no longer
experimental
......................................................................
RCFilters: Make namespace and tag features no longer experimental
Change-Id: I6a8619088d5672a156617a313d22f25701289e9c
---
M resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
3 files changed, 44 insertions(+), 50 deletions(-)
Approvals:
jenkins-bot: Verified
Mooeypoo: Looks good to me, approved
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index f1468b8..dfb8d57 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -35,11 +35,10 @@
views = {},
items = [],
uri = new mw.Uri(),
- $changesList = $( '.mw-changeslist'
).first().contents(),
- experimentalViews = mw.config.get(
'wgStructuredChangeFiltersEnableExperimentalViews' );
+ $changesList = $( '.mw-changeslist'
).first().contents();
// Prepare views
- if ( namespaceStructure && experimentalViews ) {
+ if ( namespaceStructure ) {
items = [];
$.each( namespaceStructure, function ( namespaceID,
label ) {
// Build and clean up the individual namespace
items definition
@@ -70,7 +69,7 @@
} ]
};
}
- if ( tagList && experimentalViews ) {
+ if ( tagList ) {
views.tags = {
title: mw.msg( 'rcfilters-view-tags' ),
trigger: '#',
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
index 6a6790f..5c5a2d2 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -47,7 +47,6 @@
footers: [
{
name: 'viewSelect',
- disabled: !mw.config.get(
'wgStructuredChangeFiltersEnableExperimentalViews' ),
sticky: false,
// View select menu, appears on
default view only
$element: $( '<div>' )
@@ -141,49 +140,47 @@
);
}
- if ( mw.config.get(
'wgStructuredChangeFiltersEnableExperimentalViews' ) ) {
- // Add a selector at the right of the input
- this.viewsSelectWidget = new OO.ui.ButtonSelectWidget( {
- classes: [
'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ],
- items: [
- new OO.ui.ButtonOptionWidget( {
- framed: false,
- data: 'namespaces',
- icon: 'article',
- title: mw.msg(
'rcfilters-view-namespaces-tooltip' )
- } ),
- new OO.ui.ButtonOptionWidget( {
- framed: false,
- data: 'tags',
- icon: 'tag',
- title: mw.msg(
'rcfilters-view-tags-tooltip' )
- } )
- ]
- } );
+ // Add a selector at the right of the input
+ this.viewsSelectWidget = new OO.ui.ButtonSelectWidget( {
+ classes: [
'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ],
+ items: [
+ new OO.ui.ButtonOptionWidget( {
+ framed: false,
+ data: 'namespaces',
+ icon: 'article',
+ title: mw.msg(
'rcfilters-view-namespaces-tooltip' )
+ } ),
+ new OO.ui.ButtonOptionWidget( {
+ framed: false,
+ data: 'tags',
+ icon: 'tag',
+ title: mw.msg(
'rcfilters-view-tags-tooltip' )
+ } )
+ ]
+ } );
- // Rearrange the UI so the select widget is at the
right of the input
- this.$element.append(
- $( '<div>' )
- .addClass( 'mw-rcfilters-ui-table' )
- .append(
- $( '<div>' )
- .addClass(
'mw-rcfilters-ui-row' )
- .append(
- $( '<div>' )
-
.addClass( 'mw-rcfilters-ui-cell' )
-
.addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-views-input' )
-
.append( this.input.$element ),
- $( '<div>' )
-
.addClass( 'mw-rcfilters-ui-cell' )
-
.addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-views-select' )
-
.append( this.viewsSelectWidget.$element )
- )
- )
- );
+ // Rearrange the UI so the select widget is at the right of the
input
+ this.$element.append(
+ $( '<div>' )
+ .addClass( 'mw-rcfilters-ui-table' )
+ .append(
+ $( '<div>' )
+ .addClass(
'mw-rcfilters-ui-row' )
+ .append(
+ $( '<div>' )
+ .addClass(
'mw-rcfilters-ui-cell' )
+ .addClass(
'mw-rcfilters-ui-filterTagMultiselectWidget-views-input' )
+ .append(
this.input.$element ),
+ $( '<div>' )
+ .addClass(
'mw-rcfilters-ui-cell' )
+ .addClass(
'mw-rcfilters-ui-filterTagMultiselectWidget-views-select' )
+ .append(
this.viewsSelectWidget.$element )
+ )
+ )
+ );
- // Event
- this.viewsSelectWidget.connect( this, { choose:
'onViewsSelectWidgetChoose' } );
- }
+ // Event
+ this.viewsSelectWidget.connect( this, { choose:
'onViewsSelectWidgetChoose' } );
rcFiltersRow.append(
$( '<div>' )
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 ee8e0bc..50e3637 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
@@ -133,10 +133,8 @@
} );
// Hide namespaces and tags
- if ( mw.config.get(
'wgStructuredChangeFiltersEnableExperimentalViews' ) ) {
- $namespaceSelect.closest( 'tr' ).detach();
- this.$element.find( '.mw-tagfilter-label' ).closest(
'tr' ).detach();
- }
+ $namespaceSelect.closest( 'tr' ).detach();
+ this.$element.find( '.mw-tagfilter-label' ).closest( 'tr'
).detach();
// Hide limit and days
this.$element.find( '.rclinks' ).detach();
--
To view, visit https://gerrit.wikimedia.org/r/368329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6a8619088d5672a156617a313d22f25701289e9c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: TTO <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
