jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.checkboxtoggle: Fix minor issues.
......................................................................
mediawiki.checkboxtoggle: Fix minor issues.
Follows-up 606a21c, 79414f8, 870c5e2.
* Mention class name in PHP source. Since there is no obvious link
between "mediawiki.checkboxtoggle.js" and "ListToggle.php" these
comments make it possible to find the PHP class. Previously
these css classes had 0 matches across all source code, thus
risking accidental removing.
* Quote attribute selector.
* Ensure default prevented before instead of after the handler. These toggles
have no fallback (href="#"). As such, navigation should be prevented
regardless of whether the JS fails or succeeds.
* Remove use of is(':checked'). These is no need to reach out to the
selector engine to determine whether 'checked' property is true or false.
Instead, use prop('checked') for both getting and setting.
* Simplify code by using this.checked directly instead of $().prop().
* Simplify code by using one loop (from $.prop) instead of two loops
($.prop inside $.each). This pattern is also used by selectAll().
Test by using "All", "None" and "Invert" on Special:Log.
Bug: T131318
Change-Id: Idfc43f094c6147d69104416b3f8622eabb20b824
---
M includes/ListToggle.php
M resources/src/mediawiki/mediawiki.checkboxtoggle.js
2 files changed, 9 insertions(+), 6 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ListToggle.php b/includes/ListToggle.php
index 4733dfb..2c87b8b 100644
--- a/includes/ListToggle.php
+++ b/includes/ListToggle.php
@@ -41,6 +41,7 @@
private function checkboxLink( $checkboxType ) {
return Html::element(
+ // CSS classes: mw-checkbox-all, mw-checkbox-none,
mw-checkbox-invert
'a', [ 'href' => '#', 'class' => 'mw-checkbox-' .
$checkboxType ],
$this->output->msg( 'checkbox-' . $checkboxType
)->text()
);
diff --git a/resources/src/mediawiki/mediawiki.checkboxtoggle.js
b/resources/src/mediawiki/mediawiki.checkboxtoggle.js
index 62760d2..ab7a74e 100644
--- a/resources/src/mediawiki/mediawiki.checkboxtoggle.js
+++ b/resources/src/mediawiki/mediawiki.checkboxtoggle.js
@@ -13,25 +13,27 @@
'use strict';
$( function () {
- var $checkboxes = $( 'li input[type=checkbox]' );
+ // FIXME: This shouldn't be a global selector to avoid conflicts
+ // with unrelated content on the same page. (T131318)
+ var $checkboxes = $( 'li input[type="checkbox"]' );
function selectAll( check ) {
$checkboxes.prop( 'checked', check );
}
$( '.mw-checkbox-all' ).click( function ( e ) {
- selectAll( true );
e.preventDefault();
+ selectAll( true );
} );
$( '.mw-checkbox-none' ).click( function ( e ) {
- selectAll( false );
e.preventDefault();
+ selectAll( false );
} );
$( '.mw-checkbox-invert' ).click( function ( e ) {
- $checkboxes.each( function () {
- $( this ).prop( 'checked', !$( this ).is(
':checked' ) );
- } );
e.preventDefault();
+ $checkboxes.prop( 'checked', function ( i, val ) {
+ return !val;
+ } );
} );
} );
--
To view, visit https://gerrit.wikimedia.org/r/294113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfc43f094c6147d69104416b3f8622eabb20b824
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
