Merge "Use HTML::hidden to create input fields"

[lhc/web/wiklou.git] / resources / src / mediawiki.special / mediawiki.special.block.js

diff --git a/resources/src/mediawiki.special/mediawiki.special.block.js b/resources/src/mediawiki.special/mediawiki.special.block.js
index 8dedb9b..8d88410 100644 (file)
--- a/resources/src/mediawiki.special/mediawiki.special.block.js
+++ b/resources/src/mediawiki.special/mediawiki.special.block.js
@@ -1,4 +1,4 @@
-/**
+/*!
  * JavaScript for Special:Block
  */
 ( function ( mw, $ ) {
@@ -7,19 +7,30 @@
                        $anonOnlyRow = $( '#mw-input-wpHardBlock' ).closest( 'tr' ),
                        $enableAutoblockRow = $( '#mw-input-wpAutoBlock' ).closest( 'tr' ),
                        $hideUser = $( '#mw-input-wpHideUser' ).closest( 'tr' ),
-                       $watchUser = $( '#mw-input-wpWatch' ).closest( 'tr' );
+                       $watchUser = $( '#mw-input-wpWatch' ).closest( 'tr' ),
+                       $expiry = $( '#mw-input-wpExpiry' ),
+                       $otherExpiry = $( '#mw-input-wpExpiry-other' );
 
                function updateBlockOptions( instant ) {
                        var blocktarget = $.trim( $blockTarget.val() ),
                                isEmpty = blocktarget === '',
-                               isIp = mw.util.isIPv4Address( blocktarget, true ) || mw.util.isIPv6Address( blocktarget, true ),
-                               isIpRange = isIp && blocktarget.match( /\/\d+$/ );
+                               isIp = mw.util.isIPAddress( blocktarget, true ),
+                               isIpRange = isIp && blocktarget.match( /\/\d+$/ ),
+                               isNonEmptyIp = isIp && !isEmpty,
+                               expiryValue = $expiry.val(),
+                               // infinityValues  are the values the SpecialBlock class accepts as infinity (sf. wfIsInfinity)
+                               infinityValues = [ 'infinite', 'indefinite', 'infinity', 'never' ],
+                               isIndefinite = $.inArray( expiryValue, infinityValues ) !== -1 ||
+                                       ( expiryValue === 'other' && $.inArray( $otherExpiry.val(), infinityValues ) !== -1 );
 
-                       if ( isIp && !isEmpty ) {
+                       if ( isNonEmptyIp ) {
                                $enableAutoblockRow.goOut( instant );
-                               $hideUser.goOut( instant );
                        } else {
                                $enableAutoblockRow.goIn( instant );
+                       }
+                       if ( isNonEmptyIp || !isIndefinite ) {
+                               $hideUser.goOut( instant );
+                       } else {
                                $hideUser.goIn( instant );
                        }
                        if ( !isIp && !isEmpty ) {
@@ -37,6 +48,8 @@
                if ( $blockTarget.length ) {
                        // Bind functions so they're checked whenever stuff changes
                        $blockTarget.keyup( updateBlockOptions );
+                       $expiry.change( updateBlockOptions );
+                       $otherExpiry.keyup( updateBlockOptions );
 
                        // Call them now to set initial state (ie. Special:Block/Foobar?wpBlockExpiry=2+hours)
                        updateBlockOptions( /* instant= */ true );