From: Roan Kattouw Date: Thu, 27 Jul 2017 23:56:45 +0000 (-0700) Subject: RCFilters: Make namespace and tag features no longer experimental X-Git-Tag: 1.31.0-rc.0~2557^2 X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=31be7d0fa1a40c838397babc3670fd17f828ee19;p=lhc%2Fweb%2Fwiklou.git RCFilters: Make namespace and tag features no longer experimental Change-Id: I6a8619088d5672a156617a313d22f25701289e9c --- diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index f1468b8200..dfb8d572f3 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 6a6790fba8..5c5a2d2384 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: $( '
' ) @@ -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( - $( '
' ) - .addClass( 'mw-rcfilters-ui-table' ) - .append( - $( '
' ) - .addClass( 'mw-rcfilters-ui-row' ) - .append( - $( '
' ) - .addClass( 'mw-rcfilters-ui-cell' ) - .addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-views-input' ) - .append( this.input.$element ), - $( '
' ) - .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( + $( '
' ) + .addClass( 'mw-rcfilters-ui-table' ) + .append( + $( '
' ) + .addClass( 'mw-rcfilters-ui-row' ) + .append( + $( '
' ) + .addClass( 'mw-rcfilters-ui-cell' ) + .addClass( 'mw-rcfilters-ui-filterTagMultiselectWidget-views-input' ) + .append( this.input.$element ), + $( '
' ) + .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( $( '
' ) 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 ee8e0bc1b9..50e36372f1 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();