Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78472
Change subject: Cleaning up JS to pass JSLint
......................................................................
Cleaning up JS to pass JSLint
Change-Id: I7708773342d60c14ff367fe49b901e63c41fdfa3
---
M mixins/BannerDiet/BannerDiet.js
M modules/ext.centralNotice.adminUi.bannerEditor/bannereditor.js
M modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
M modules/ext.centralNotice.adminUi.campaignManager/campaignManager.js
M modules/ext.centralNotice.adminUi/centralnotice.js
M modules/ext.centralNotice.bannerController/bannerController.js
6 files changed, 16 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/72/78472/1
diff --git a/mixins/BannerDiet/BannerDiet.js b/mixins/BannerDiet/BannerDiet.js
index bfa212e..08d4d6a 100644
--- a/mixins/BannerDiet/BannerDiet.js
+++ b/mixins/BannerDiet/BannerDiet.js
@@ -3,9 +3,9 @@
$.cookie( '{{{hide-cookie-name}}}', 0, { expires: 365, path:
'/' } );
return true;
}
- var cookieCount = parseInt( $.cookie( '{{{hide-cookie-name}}}' ) ) | 0;
+ var cookieCount = parseInt( $.cookie( '{{{hide-cookie-name}}}' ), 10 )
| 0;
- if ( cookieCount < {{{hide-cookie-max-count}}} ) {
+ if ( cookieCount < parseInt( '{{{hide-cookie-max-count}}}', 10 ) ) {
$.cookie( '{{{hide-cookie-name}}}', cookieCount + 1, { expires:
365, path: '/' } );
return true;
} else {
diff --git a/modules/ext.centralNotice.adminUi.bannerEditor/bannereditor.js
b/modules/ext.centralNotice.adminUi.bannerEditor/bannereditor.js
index 6ca2697..4c34d64 100644
--- a/modules/ext.centralNotice.adminUi.bannerEditor/bannereditor.js
+++ b/modules/ext.centralNotice.adminUi.bannerEditor/bannereditor.js
@@ -64,7 +64,7 @@
*/
doSaveBanner: function() {
if ( $( '#mw-input-wpbanner-body' ).prop( 'value'
).indexOf( 'document.write' ) > -1 ) {
- alert( mediaWiki.msg(
'centralnotice-documentwrite-error' ) );
+ window.alert( mediaWiki.msg(
'centralnotice-documentwrite-error' ) );
} else {
return true;
}
diff --git a/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
b/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
index 03ffb04..431f88d 100644
--- a/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
+++ b/modules/ext.centralNotice.adminUi.bannerManager/bannermanager.js
@@ -146,8 +146,6 @@
* Updates the 'checkAll' check box if any of the banner check
boxes are checked
*/
selectCheckStateAltered: function() {
- var selectAllCheck = $( '#mw-input-wpselectAllBanners'
);
-
if ( $( this ).prop( 'checked' ) === true ) {
mw.centralNotice.adminUi.bannerManagement.selectedItemCount++;
} else {
@@ -170,7 +168,7 @@
selectAllCheck.prop( 'checked', true );
selectAllCheck.prop( 'indeterminate', false );
deleteButton.prop( 'disabled', false );
- } else if (
mw.centralNotice.adminUi.bannerManagement.selectedItemCount == 0 ) {
+ } else if (
mw.centralNotice.adminUi.bannerManagement.selectedItemCount === 0 ) {
// Nothing selected
selectAllCheck.prop( 'checked', false );
selectAllCheck.prop( 'indeterminate', false );
diff --git
a/modules/ext.centralNotice.adminUi.campaignManager/campaignManager.js
b/modules/ext.centralNotice.adminUi.campaignManager/campaignManager.js
index e0a01e9..eee7abe 100644
--- a/modules/ext.centralNotice.adminUi.campaignManager/campaignManager.js
+++ b/modules/ext.centralNotice.adminUi.campaignManager/campaignManager.js
@@ -22,7 +22,7 @@
*
* @file
*/
-( function ( $, mw ) {
+( function ( $ ) {
$( '#centralnotice-showarchived' ).click( function() {
if ( $( this ).prop( 'checked' ) === true ) {
$( '.cn-archived-item' ).show();
@@ -30,4 +30,4 @@
$( '.cn-archived-item' ).hide();
}
});
-} )( jQuery, mediaWiki );
+} )( jQuery );
diff --git a/modules/ext.centralNotice.adminUi/centralnotice.js
b/modules/ext.centralNotice.adminUi/centralnotice.js
index 3fc7a18..8bd15ba 100644
--- a/modules/ext.centralNotice.adminUi/centralnotice.js
+++ b/modules/ext.centralNotice.adminUi/centralnotice.js
@@ -114,11 +114,9 @@
} );
// Bucketing! Disable bucket selectors if #buckets is not checked.
- bucketSelect = $( '#buckets' );
- buckets = $( 'select[id^="bucketSelector"]' );
-
- bucketSelect.change( function () {
- numBuckets = parseInt( this[this.selectedIndex].value );
+ $( '#buckets' ).change( function () {
+ var numBuckets = parseInt( this[this.selectedIndex].value, 10 ),
+ buckets = $( 'select[id^="bucketSelector"]' );
if ( numBuckets == 1 ) {
buckets.prop( 'disabled', true );
@@ -127,16 +125,13 @@
// Go through and modify all the options -- disabling
inappropriate ones
// and remapping the rings
buckets.each( function() {
- var curBucket = parseInt( this[this.selectedIndex].value );
+ var curBucket = parseInt( this[this.selectedIndex].value, 10 );
$(this).val( curBucket % numBuckets );
for ( var i = 0; i < this.options.length; i++ ) {
- $(this.options[i]).prop( 'disabled', !(i < numBuckets) );
+ $(this.options[i]).prop( 'disabled', (i >= numBuckets) );
}
- })
+ });
}
- } );
-
- // Initial state
- bucketSelect.trigger( 'change' );
+ } ).trigger( 'change' );
} );
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index bad3acb..a4c0132 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -230,7 +230,7 @@
//
// TODO: Migrate away from global functions
window.insertBanner = function ( bannerJson ) {
- var url, targets, data;
+ var url, targets;
var impressionData = {
country: mw.centralNotice.data.country,
@@ -260,7 +260,7 @@
impressionResultData = {
result: 'hide',
reason: 'preload'
- }
+ };
} else if (
bannerJson.priority < 3 && /* A priority of 3
is Emergency and cannot be hidden */
!mw.centralNotice.data.testing && /* And we
want to see what we're testing! :) */
@@ -270,7 +270,7 @@
impressionResultData = {
result: 'hide',
reason: 'cookie'
- }
+ };
} else {
// All conditions fulfilled, inject the banner
mw.centralNotice.bannerData.bannerName =
bannerJson.bannerName;
--
To view, visit https://gerrit.wikimedia.org/r/78472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7708773342d60c14ff367fe49b901e63c41fdfa3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Mwalker <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
