// 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 );
// Replace the entire fieldset
this.$element.empty().append( $fieldset.contents() );
+ // Make sure enhanced RC re-initializes correctly
+ mw.hook( 'wikipage.content' ).fire( this.$element );
this.cleanUpFieldset();
* Clean up the old-style show/hide that we have implemented in the filter list
*/
mw.rcfilters.ui.FormWrapperWidget.prototype.cleanUpFieldset = function () {
- var widget = this;
-
- // HACK: Remove old-style filter links for filters handled by the widget
- // Ideally the widget would handle all filters and we'd just remove .rcshowhide entirely
- this.$element.find( '.rcshowhide' ).children().each( function () {
- // HACK: Interpret the class name to get the filter name
- // This should really be set as a data attribute
- var i,
- name = null,
- // Some of the older browsers we support don't have .classList,
- // so we have to interpret the class attribute manually.
- classes = this.getAttribute( 'class' ).split( ' ' );
- for ( i = 0; i < classes.length; i++ ) {
- if ( classes[ i ].substr( 0, 'rcshow'.length ) === 'rcshow' ) {
- name = classes[ i ].substr( 'rcshow'.length );
- break;
- }
- }
- if ( name === null ) {
- return;
- }
- if ( name === 'hidemine' ) {
- // HACK: the span for hidemyself is called hidemine
- name = 'hidemyself';
- }
-
- // This span corresponds to a filter that's in our model, so remove it
- if ( widget.filtersModel.getItemByName( name ) ) {
- // HACK: Remove the text node after the span.
- // If there isn't one, we're at the end, so remove the text node before the span.
- // This would be unnecessary if we added separators with CSS.
- if ( this.nextSibling && this.nextSibling.nodeType === Node.TEXT_NODE ) {
- this.parentNode.removeChild( this.nextSibling );
- } else if ( this.previousSibling && this.previousSibling.nodeType === Node.TEXT_NODE ) {
- this.parentNode.removeChild( this.previousSibling );
- }
- // Remove the span itself
- this.parentNode.removeChild( this );
+ var $namespaceSelect = this.$element.find( '#namespace' ),
+ collapseCookieName = 'changeslist-state';
+
+ this.$element.find( '.rcshowhideoption[data-feature-in-structured-ui=1]' ).each( function () {
+ // HACK: Remove the text node after the span.
+ // If there isn't one, we're at the end, so remove the text node before the span.
+ // This would be unnecessary if we added separators with CSS.
+ if ( this.nextSibling && this.nextSibling.nodeType === Node.TEXT_NODE ) {
+ this.parentNode.removeChild( this.nextSibling );
+ } else if ( this.previousSibling && this.previousSibling.nodeType === Node.TEXT_NODE ) {
+ this.parentNode.removeChild( this.previousSibling );
}
+ // Remove the span itself
+ this.parentNode.removeChild( this );
} );
+
+ // Hide namespaces and tags
+ if ( mw.config.get( 'wgStructuredChangeFiltersEnableExperimentalViews' ) ) {
+ $namespaceSelect.closest( 'tr' ).detach();
+ this.$element.find( '.mw-tagfilter-label' ).closest( 'tr' ).detach();
+ }
+
+ // 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' );
+ } );
+
};
}( mediaWiki ) );