X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=resources%2Fsrc%2Fmediawiki.rcfilters%2Fui%2Fmw.rcfilters.ui.FormWrapperWidget.js;h=dbee65c776882386033db725fbb11fcea757a7eb;hb=5049af1048c77b1ea6ab3193688d23a48ddf8df0;hp=d17fffffe68cc4a2e6d3067227ecf24d2ff7d8ab;hpb=386c6ae9c5a5e9fe133a333b653b4d080dff1718;p=lhc%2Fweb%2Fwiklou.git

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 d17fffffe6..dbee65c776 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
@@ -72,9 +72,13 @@
 
 		// Collect all data from form
 		$( e.target ).find( 'input:not([type="hidden"],[type="submit"]), select' ).each( function () {
+			var value = '';
+
 			if ( !$( this ).is( ':checkbox' ) || $( this ).is( ':checked' ) ) {
-				data[ $( this ).prop( 'name' ) ] = $( this ).val();
+				value = $( this ).val();
 			}
+
+			data[ $( this ).prop( 'name' ) ] = value;
 		} );
 
 		this.controller.updateChangesList( data );
@@ -113,9 +117,7 @@
 	 * Clean up the old-style show/hide that we have implemented in the filter list
 	 */
 	mw.rcfilters.ui.FormWrapperWidget.prototype.cleanUpFieldset = function () {
-		var $namespaceSelect = this.$element.find( '#namespace' ),
-			$namespaceCheckboxes = this.$element.find( '#nsassociated, #nsinvert' ),
-			collapseCookieName = 'changeslist-state';
+		var $namespaceSelect = this.$element.find( '#namespace' );
 
 		this.$element.find( '.rcshowhideoption[data-feature-in-structured-ui=1]' ).each( function () {
 			// HACK: Remove the text node after the span.
@@ -130,25 +132,14 @@
 			this.parentNode.removeChild( this );
 		} );
 
-		// Bind namespace select to change event
-		// see resources/src/mediawiki.special/mediawiki.special.recentchanges.js
-		$namespaceCheckboxes.prop( 'disabled', $namespaceSelect.val() === '' );
-		$namespaceSelect.on( 'change', function () {
-			$namespaceCheckboxes.prop( 'disabled', $( this ).val() === '' );
-		} );
-
-		// Collapse legend
-		// see resources/src/mediawiki.special/mediawiki.special.changelist.legend.js
-		this.$element.find( '.mw-changeslist-legend' )
-			.makeCollapsible( {
-				collapsed: mw.cookie.get( collapseCookieName ) === 'collapsed'
-			} )
-			.on( 'beforeExpand.mw-collapsible', function () {
-				mw.cookie.set( collapseCookieName, 'expanded' );
-			} )
-			.on( 'beforeCollapse.mw-collapsible', function () {
-				mw.cookie.set( collapseCookieName, 'collapsed' );
-			} );
+		// Hide namespaces and tags
+		if ( mw.config.get( 'wgStructuredChangeFiltersEnableExperimentalViews' ) ) {
+			$namespaceSelect.closest( 'tr' ).detach();
+			this.$element.find( '.mw-tagfilter-label' ).closest( 'tr' ).detach();
+		}
 
+		if ( !this.$element.find( '.mw-recentchanges-table tr' ).length ) {
+			this.$element.find( 'hr' ).detach();
+		}
 	};
 }( mediaWiki ) );