[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.2]: Revert "SpecialBlock: Tweaks for OOUI HTMLForm"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383010 )
Change subject: Revert "SpecialBlock: Tweaks for OOUI HTMLForm"
..
Revert "SpecialBlock: Tweaks for OOUI HTMLForm"
This reverts commit b2a0e3aac8f70802a5f45cc7e7fbb0f9c517fb82.
Bug: T177705
Change-Id: Iadc4a82119e6ecc4ac42428e038e43bbb0a0df62
---
M includes/specials/SpecialBlock.php
M resources/Resources.php
M resources/src/mediawiki.special/mediawiki.special.block.js
M resources/src/mediawiki.special/mediawiki.special.css
4 files changed, 35 insertions(+), 48 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialBlock.php
b/includes/specials/SpecialBlock.php
index 42e7040..c1a1f78 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -224,7 +224,6 @@
'type' => 'hidden',
'default' => '',
'label-message' => 'ipb-confirm',
- 'cssclass' => 'mw-block-confirm',
];
$this->maybeAlterFormDefaults( $a );
diff --git a/resources/Resources.php b/resources/Resources.php
index f697e41..346bc50 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2013,8 +2013,6 @@
'mediawiki.special.block' => [
'scripts' =>
'resources/src/mediawiki.special/mediawiki.special.block.js',
'dependencies' => [
- 'oojs-ui-core',
- 'mediawiki.widgets.SelectWithInputWidget',
'mediawiki.util',
'mediawiki.htmlform',
],
diff --git a/resources/src/mediawiki.special/mediawiki.special.block.js
b/resources/src/mediawiki.special/mediawiki.special.block.js
index 491a1ff..8d88410 100644
--- a/resources/src/mediawiki.special/mediawiki.special.block.js
+++ b/resources/src/mediawiki.special/mediawiki.special.block.js
@@ -2,60 +2,57 @@
* JavaScript for Special:Block
*/
( function ( mw, $ ) {
- // Like OO.ui.infuse(), but if the element doesn't exist, return null
instead of throwing an exception.
- function infuseOrNull( elem ) {
- try {
- return OO.ui.infuse( elem );
- } catch ( er ) {
- return null;
- }
- }
-
$( function () {
- // This code is also loaded on the "block succeeded" page where
there is no form,
- // so username and expiry fields might also be missing.
- var blockTargetWidget = infuseOrNull( 'mw-bi-target' ),
- anonOnlyField = infuseOrNull( $(
'#mw-input-wpHardBlock' ).closest( '.oo-ui-fieldLayout' ) ),
- enableAutoblockField = infuseOrNull( $(
'#mw-input-wpAutoBlock' ).closest( '.oo-ui-fieldLayout' ) ),
- hideUserField = infuseOrNull( $( '#mw-input-wpHideUser'
).closest( '.oo-ui-fieldLayout' ) ),
- watchUserField = infuseOrNull( $( '#mw-input-wpWatch'
).closest( '.oo-ui-fieldLayout' ) ),
- // mw.widgets.SelectWithInputWidget
- expiryWidget = infuseOrNull( 'mw-input-wpExpiry' );
+ var $blockTarget = $( '#mw-bi-target' ),
+ $anonOnlyRow = $( '#mw-input-wpHardBlock' ).closest(
'tr' ),
+ $enableAutoblockRow = $( '#mw-input-wpAutoBlock'
).closest( 'tr' ),
+ $hideUser = $( '#mw-input-wpHideUser' ).closest( 'tr' ),
+ $watchUser = $( '#mw-input-wpWatch' ).closest( 'tr' ),
+ $expiry = $( '#mw-input-wpExpiry' ),
+ $otherExpiry = $( '#mw-input-wpExpiry-other' );
- function updateBlockOptions() {
- var blocktarget = $.trim( blockTargetWidget.getValue()
),
+ function updateBlockOptions( instant ) {
+ var blocktarget = $.trim( $blockTarget.val() ),
isEmpty = blocktarget === '',
isIp = mw.util.isIPAddress( blocktarget, true ),
isIpRange = isIp && blocktarget.match( /\/\d+$/
),
isNonEmptyIp = isIp && !isEmpty,
- expiryValue =
expiryWidget.dropdowninput.getValue(),
+ 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(
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.2]: Revert "SpecialBlock: Tweaks for OOUI HTMLForm"
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383010 )
Change subject: Revert "SpecialBlock: Tweaks for OOUI HTMLForm"
..
Revert "SpecialBlock: Tweaks for OOUI HTMLForm"
This reverts commit b2a0e3aac8f70802a5f45cc7e7fbb0f9c517fb82.
Bug: T177705
Change-Id: Iadc4a82119e6ecc4ac42428e038e43bbb0a0df62
---
M includes/specials/SpecialBlock.php
M resources/Resources.php
M resources/src/mediawiki.special/mediawiki.special.block.js
M resources/src/mediawiki.special/mediawiki.special.css
4 files changed, 35 insertions(+), 48 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/10/383010/1
diff --git a/includes/specials/SpecialBlock.php
b/includes/specials/SpecialBlock.php
index 42e7040..c1a1f78 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -224,7 +224,6 @@
'type' => 'hidden',
'default' => '',
'label-message' => 'ipb-confirm',
- 'cssclass' => 'mw-block-confirm',
];
$this->maybeAlterFormDefaults( $a );
diff --git a/resources/Resources.php b/resources/Resources.php
index f697e41..346bc50 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2013,8 +2013,6 @@
'mediawiki.special.block' => [
'scripts' =>
'resources/src/mediawiki.special/mediawiki.special.block.js',
'dependencies' => [
- 'oojs-ui-core',
- 'mediawiki.widgets.SelectWithInputWidget',
'mediawiki.util',
'mediawiki.htmlform',
],
diff --git a/resources/src/mediawiki.special/mediawiki.special.block.js
b/resources/src/mediawiki.special/mediawiki.special.block.js
index 491a1ff..8d88410 100644
--- a/resources/src/mediawiki.special/mediawiki.special.block.js
+++ b/resources/src/mediawiki.special/mediawiki.special.block.js
@@ -2,60 +2,57 @@
* JavaScript for Special:Block
*/
( function ( mw, $ ) {
- // Like OO.ui.infuse(), but if the element doesn't exist, return null
instead of throwing an exception.
- function infuseOrNull( elem ) {
- try {
- return OO.ui.infuse( elem );
- } catch ( er ) {
- return null;
- }
- }
-
$( function () {
- // This code is also loaded on the "block succeeded" page where
there is no form,
- // so username and expiry fields might also be missing.
- var blockTargetWidget = infuseOrNull( 'mw-bi-target' ),
- anonOnlyField = infuseOrNull( $(
'#mw-input-wpHardBlock' ).closest( '.oo-ui-fieldLayout' ) ),
- enableAutoblockField = infuseOrNull( $(
'#mw-input-wpAutoBlock' ).closest( '.oo-ui-fieldLayout' ) ),
- hideUserField = infuseOrNull( $( '#mw-input-wpHideUser'
).closest( '.oo-ui-fieldLayout' ) ),
- watchUserField = infuseOrNull( $( '#mw-input-wpWatch'
).closest( '.oo-ui-fieldLayout' ) ),
- // mw.widgets.SelectWithInputWidget
- expiryWidget = infuseOrNull( 'mw-input-wpExpiry' );
+ var $blockTarget = $( '#mw-bi-target' ),
+ $anonOnlyRow = $( '#mw-input-wpHardBlock' ).closest(
'tr' ),
+ $enableAutoblockRow = $( '#mw-input-wpAutoBlock'
).closest( 'tr' ),
+ $hideUser = $( '#mw-input-wpHideUser' ).closest( 'tr' ),
+ $watchUser = $( '#mw-input-wpWatch' ).closest( 'tr' ),
+ $expiry = $( '#mw-input-wpExpiry' ),
+ $otherExpiry = $( '#mw-input-wpExpiry-other' );
- function updateBlockOptions() {
- var blocktarget = $.trim( blockTargetWidget.getValue()
),
+ function updateBlockOptions( instant ) {
+ var blocktarget = $.trim( $blockTarget.val() ),
isEmpty = blocktarget === '',
isIp = mw.util.isIPAddress( blocktarget, true ),
isIpRange = isIp && blocktarget.match( /\/\d+$/
),
isNonEmptyIp = isIp && !isEmpty,
- expiryValue =
expiryWidget.dropdowninput.getValue(),
+ 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(
