X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2Fsrc%2Fmediawiki.special.block.js;h=58657dbd3e47f1736dad01a230b012817f5289d4;hb=d6ca62639346d3c78b0d370ba1027e5fb6ac8a9d;hp=1767411ef1c218b56413d42f00a5e6e0fcc29a3a;hpb=dc941617b2128b13f87c06469bfd77277d0d7484;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/mediawiki.special.block.js b/resources/src/mediawiki.special.block.js
index 1767411ef1..58657dbd3e 100644
--- a/resources/src/mediawiki.special.block.js
+++ b/resources/src/mediawiki.special.block.js
@@ -11,8 +11,8 @@
 	}
 
 	$( function () {
-		var blockTargetWidget, anonOnlyField, enableAutoblockField, hideUserWidget, hideUserField,
-			watchUserField, expiryWidget, editingWidget, editingRestrictionWidget, preventTalkPageEditWidget,
+		var blockTargetWidget, anonOnlyWidget, enableAutoblockWidget, hideUserWidget, watchUserWidget,
+			expiryWidget, editingWidget, editingRestrictionWidget, preventTalkPageEditWidget,
 			pageRestrictionsWidget, namespaceRestrictionsWidget, createAccountWidget, data,
 			enablePartialBlocks, blockAllowsUTEdit, userChangedCreateAccount, updatingBlockOptions;
 
@@ -30,18 +30,28 @@
 				editingIsSelected = editingWidget.isSelected(),
 				isSitewide = editingIsSelected && editingRestrictionValue === 'sitewide';
 
-			enableAutoblockField.toggle( !isNonEmptyIp );
-			anonOnlyField.toggle( isIp || isEmpty );
+			enableAutoblockWidget.setDisabled( isNonEmptyIp );
+			if ( enableAutoblockWidget.isDisabled() ) {
+				enableAutoblockWidget.setSelected( false );
+			}
+
+			anonOnlyWidget.setDisabled( !isIp && !isEmpty );
+			if ( anonOnlyWidget.isDisabled() ) {
+				anonOnlyWidget.setSelected( false );
+			}
 
-			if ( hideUserField ) {
-				hideUserField.toggle( !isNonEmptyIp && isIndefinite && isSitewide );
-				if ( !hideUserField.isVisible() ) {
+			if ( hideUserWidget ) {
+				hideUserWidget.setDisabled( isNonEmptyIp || !isIndefinite || !isSitewide );
+				if ( hideUserWidget.isDisabled() ) {
 					hideUserWidget.setSelected( false );
 				}
 			}
 
-			if ( watchUserField ) {
-				watchUserField.toggle( !isIpRange || isEmpty );
+			if ( watchUserWidget ) {
+				watchUserWidget.setDisabled( isIpRange && !isEmpty );
+				if ( watchUserWidget.isDisabled() ) {
+					watchUserWidget.setSelected( false );
+				}
 			}
 
 			if ( enablePartialBlocks ) {
@@ -84,8 +94,8 @@
 			editingWidget = OO.ui.infuse( $( '#mw-input-wpEditing' ) );
 			expiryWidget = OO.ui.infuse( $( '#mw-input-wpExpiry' ) );
 			createAccountWidget = OO.ui.infuse( $( '#mw-input-wpCreateAccount' ) );
-			enableAutoblockField = OO.ui.infuse( $( '#mw-input-wpAutoBlock' ).closest( '.oo-ui-fieldLayout' ) );
-			anonOnlyField = OO.ui.infuse( $( '#mw-input-wpHardBlock' ).closest( '.oo-ui-fieldLayout' ) );
+			enableAutoblockWidget = OO.ui.infuse( $( '#mw-input-wpAutoBlock' ) );
+			anonOnlyWidget = OO.ui.infuse( $( '#mw-input-wpHardBlock' ) );
 			blockTargetWidget.on( 'change', updateBlockOptions );
 			editingWidget.on( 'change', updateBlockOptions );
 			expiryWidget.on( 'change', updateBlockOptions );
@@ -96,8 +106,7 @@
 			} );
 
 			// Present for certain rights
-			watchUserField = infuseIfExists( $( '#mw-input-wpWatch' ).closest( '.oo-ui-fieldLayout' ) );
-			hideUserField = infuseIfExists( $( '#mw-input-wpHideUser' ).closest( '.oo-ui-fieldLayout' ) );
+			watchUserWidget = infuseIfExists( $( '#mw-input-wpWatch' ) );
 			hideUserWidget = infuseIfExists( $( '#mw-input-wpHideUser' ) );
 
 			// Present for certain global configs