X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.rcfilters%2Fui%2Fmw.rcfilters.ui.FilterMenuOptionWidget.js;h=5198c699b028c27a0376ceb725304aa4cb35705d;hb=01c3bf3431e9754b79e4a4a31fa74ce9e6616514;hp=bda537f1f1b0e25d9e87a4deccfa3806650f4ece;hpb=c872b6438b052cfe03df834779b9a13581ccf7eb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js
index bda537f1f1..5198c699b0 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuOptionWidget.js
@@ -2,7 +2,7 @@
 	/**
 	 * A widget representing a single toggle filter
 	 *
-	 * @extends OO.ui.MenuOptionWidget
+	 * @extends mw.rcfilters.ui.ItemMenuOptionWidget
 	 *
 	 * @constructor
 	 * @param {mw.rcfilters.Controller} controller RCFilters controller
@@ -10,88 +10,23 @@
 	 * @param {Object} config Configuration object
 	 */
 	mw.rcfilters.ui.FilterMenuOptionWidget = function MwRcfiltersUiFilterMenuOptionWidget( controller, model, config ) {
-		var layout,
-			$label = $( '<div>' )
-				.addClass( 'mw-rcfilters-ui-filterMenuOptionWidget-label' );
-
 		config = config || {};
 
 		this.controller = controller;
 		this.model = model;
 
 		// Parent
-		mw.rcfilters.ui.FilterMenuOptionWidget.parent.call( this, $.extend( {
-			// Override the 'check' icon that OOUI defines
-			icon: '',
-			data: this.model.getName(),
-			label: this.model.getLabel()
-		}, config ) );
-
-		this.checkboxWidget = new mw.rcfilters.ui.CheckboxInputWidget( {
-			value: this.model.getName(),
-			selected: this.model.isSelected()
-		} );
-
-		$label.append(
-			$( '<div>' )
-				.addClass( 'mw-rcfilters-ui-filterMenuOptionWidget-label-title' )
-				.append( this.$label )
-		);
-		if ( this.model.getDescription() ) {
-			$label.append(
-				$( '<div>' )
-					.addClass( 'mw-rcfilters-ui-filterMenuOptionWidget-label-desc' )
-					.text( this.model.getDescription() )
-			);
-		}
-
-		this.highlightButton = new mw.rcfilters.ui.FilterItemHighlightButton(
-			this.controller,
-			this.model,
-			{
-				$overlay: config.$overlay || this.$element,
-				title: mw.msg( 'rcfilters-highlightmenu-help' )
-			}
-		);
-		this.highlightButton.toggle( this.model.isHighlightEnabled() );
+		mw.rcfilters.ui.FilterMenuOptionWidget.parent.call( this, controller, model, config );
 
-		layout = new OO.ui.FieldLayout( this.checkboxWidget, {
-			label: $label,
-			align: 'inline'
-		} );
 		// Event
-		this.model.connect( this, { update: 'onModelUpdate' } );
 		this.model.getGroupModel().connect( this, { update: 'onGroupModelUpdate' } );
-		// HACK: Prevent defaults on 'click' for the label so it
-		// doesn't steal the focus away from the input. This means
-		// we can continue arrow-movement after we click the label
-		// and is consistent with the checkbox *itself* also preventing
-		// defaults on 'click' as well.
-		layout.$label.on( 'click', false );
 
 		this.$element
-			.addClass( 'mw-rcfilters-ui-filterMenuOptionWidget' )
-			.append(
-				$( '<div>' )
-					.addClass( 'mw-rcfilters-ui-table' )
-					.append(
-						$( '<div>' )
-							.addClass( 'mw-rcfilters-ui-row' )
-							.append(
-								$( '<div>' )
-									.addClass( 'mw-rcfilters-ui-cell mw-rcfilters-ui-filterMenuOptionWidget-filterCheckbox' )
-									.append( layout.$element ),
-								$( '<div>' )
-									.addClass( 'mw-rcfilters-ui-cell mw-rcfilters-ui-filterMenuOptionWidget-highlightButton' )
-									.append( this.highlightButton.$element )
-							)
-					)
-			);
+			.addClass( 'mw-rcfilters-ui-filterMenuOptionWidget' );
 	};
 
 	/* Initialization */
-
-	OO.inheritClass( mw.rcfilters.ui.FilterMenuOptionWidget, OO.ui.MenuOptionWidget );
+	OO.inheritClass( mw.rcfilters.ui.FilterMenuOptionWidget, mw.rcfilters.ui.ItemMenuOptionWidget );
 
 	/* Static properties */
 
@@ -101,10 +36,11 @@
 	/* Methods */
 
 	/**
-	 * Respond to item model update event
+	 * @inheritdoc
 	 */
 	mw.rcfilters.ui.FilterMenuOptionWidget.prototype.onModelUpdate = function () {
-		this.checkboxWidget.setSelected( this.model.isSelected() );
+		// Parent
+		mw.rcfilters.ui.FilterMenuOptionWidget.parent.prototype.onModelUpdate.call( this );
 
 		this.setCurrentMuteState();
 	};
@@ -117,36 +53,32 @@
 	};
 
 	/**
-	 * Set the current mute state for this item
+	 * Set the current muted view of the widget based on its state
 	 */
 	mw.rcfilters.ui.FilterMenuOptionWidget.prototype.setCurrentMuteState = function () {
-		this.$element.toggleClass(
-			'mw-rcfilters-ui-filterMenuOptionWidget-muted',
-			this.model.isConflicted() ||
-			(
-				// Item is also muted when any of the items in its group is active
-				this.model.getGroupModel().isActive() &&
-				// But it isn't selected
-				!this.model.isSelected() &&
-				// And also not included
-				!this.model.isIncluded()
-			)
-		);
-
-		this.highlightButton.toggle( this.model.isHighlightEnabled() );
-	};
-
-	/**
-	 * Get the name of this filter
-	 *
-	 * @return {string} Filter name
-	 */
-	mw.rcfilters.ui.FilterMenuOptionWidget.prototype.getName = function () {
-		return this.model.getName();
-	};
-
-	mw.rcfilters.ui.FilterMenuOptionWidget.prototype.getModel = function () {
-		return this.model;
+		if (
+			this.model.getGroupModel().getView() === 'namespaces' &&
+			this.model.isInverted()
+		) {
+			// This is an inverted behavior than the other rules, specifically
+			// for inverted namespaces
+			this.setFlags( {
+				muted: this.model.isSelected()
+			} );
+		} else {
+			this.setFlags( {
+				muted: (
+					this.model.isConflicted() ||
+					(
+						// Item is also muted when any of the items in its group is active
+						this.model.getGroupModel().isActive() &&
+						// But it isn't selected
+						!this.model.isSelected() &&
+						// And also not included
+						!this.model.isIncluded()
+					)
+				)
+			} );
+		}
 	};
-
 }( mediaWiki ) );