Fomafix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392376 )
Change subject: Special:UserRights: Show/hide the expiry selection with CSS
......................................................................
Special:UserRights: Show/hide the expiry selection with CSS
This prevents a FOUC on loading.
Change-Id: I33a4b0a13dab92156aeea96529573ad49fa2d616
---
M includes/specials/SpecialUserrights.php
M resources/src/mediawiki.special/mediawiki.special.userrights.css
M resources/src/mediawiki.special/mediawiki.special.userrights.js
3 files changed, 10 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/76/392376/1
diff --git a/includes/specials/SpecialUserrights.php
b/includes/specials/SpecialUserrights.php
index 4e4394d..5c779f0 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -847,10 +847,6 @@
}
$checkboxHtml = Xml::checkLabel( $text,
"wpGroup-" . $group,
"wpGroup-" . $group, $checkbox['set'],
$attr );
- $ret .= "\t\t" . ( ( $checkbox['disabled'] &&
$checkbox['disabled-expiry'] )
- ? Xml::tags( 'div', [ 'class' =>
'mw-userrights-disabled' ], $checkboxHtml )
- : Xml::tags( 'div', [], $checkboxHtml )
- ) . "\n";
if ( $this->canProcessExpiries() ) {
$uiUser = $this->getUser();
@@ -939,8 +935,12 @@
'id' =>
"mw-userrights-nested-wpGroup-$group",
'class' =>
'mw-userrights-nested',
];
- $ret .= "\t\t\t" . Xml::tags( 'div',
$divAttribs, $expiryHtml ) . "\n";
+ $checkboxHtml .= "\t\t\t" . Xml::tags(
'div', $divAttribs, $expiryHtml ) . "\n";
}
+ $ret .= "\t\t" . ( ( $checkbox['disabled'] &&
$checkbox['disabled-expiry'] )
+ ? Xml::tags( 'div', [ 'class' =>
'mw-userrights-disabled' ], $checkboxHtml )
+ : Xml::tags( 'div', [], $checkboxHtml )
+ ) . "\n";
}
$ret .= "\t</td>\n";
}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userrights.css
b/resources/src/mediawiki.special/mediawiki.special.userrights.css
index acfdb56..a71f39a 100644
--- a/resources/src/mediawiki.special/mediawiki.special.userrights.css
+++ b/resources/src/mediawiki.special/mediawiki.special.userrights.css
@@ -22,3 +22,7 @@
.mw-userrights-groups * th {
text-align: left;
}
+
+#mw-userrights-form2 input[type=checkbox]:not( :checked ) ~ div {
+ display: none;
+}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userrights.js
b/resources/src/mediawiki.special/mediawiki.special.userrights.js
index 3f864dd..702f4c4 100644
--- a/resources/src/mediawiki.special/mediawiki.special.userrights.js
+++ b/resources/src/mediawiki.special/mediawiki.special.userrights.js
@@ -6,12 +6,7 @@
// Replace successbox with notifications
convertmessagebox();
- // Dynamically show/hide the expiry selection underneath each checkbox
- $( '#mw-userrights-form2 input[type=checkbox]' ).on( 'change', function
( e ) {
- $( '#mw-userrights-nested-' + e.target.id ).toggle(
e.target.checked );
- } ).trigger( 'change' );
-
- // Also dynamically show/hide the "other time" input under each dropdown
+ // Dynamically show/hide the "other time" input under each dropdown
$( '.mw-userrights-nested select' ).on( 'change', function ( e ) {
$( e.target.parentNode ).find( 'input' ).toggle( $( e.target
).val() === 'other' );
} ).trigger( 'change' );
--
To view, visit https://gerrit.wikimedia.org/r/392376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33a4b0a13dab92156aeea96529573ad49fa2d616
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix <foma...@googlemail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
