AndyRussG has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/344732 )
Change subject: Fix simple issues detected by eslint
......................................................................
Fix simple issues detected by eslint
Bug: T161142
Change-Id: I6593499f954040ee654fbe3b302be37928f063a0
---
M .eslintrc.json
M resources/infrastructure/bannereditor.js
M resources/infrastructure/bannermanager.js
M resources/infrastructure/campaignManager.js
M resources/infrastructure/centralnotice.js
M resources/infrastructure/ext.centralNotice.adminUi.campaignPager.js
M resources/subscribing/ext.centralNotice.bannerHistoryLogger.js
M resources/subscribing/ext.centralNotice.display.bucketer.js
M resources/subscribing/ext.centralNotice.display.chooser.js
M resources/subscribing/ext.centralNotice.display.hide.js
M resources/subscribing/ext.centralNotice.display.js
M resources/subscribing/ext.centralNotice.display.state.js
M resources/subscribing/ext.centralNotice.freegeoipLookup.js
M resources/subscribing/ext.centralNotice.geoIP.js
M resources/subscribing/ext.centralNotice.impressionDiet.js
M resources/subscribing/ext.centralNotice.kvStore.js
M resources/subscribing/ext.centralNotice.kvStoreMaintenance.js
M resources/subscribing/ext.centralNotice.largeBannerLimit.js
M resources/subscribing/ext.centralNotice.legacySupport.js
M resources/subscribing/ext.centralNotice.startUp.js
20 files changed, 40 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/32/344732/1
diff --git a/.eslintrc.json b/.eslintrc.json
index a4c4339..3d4bed8 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -8,17 +8,14 @@
"jquery": true
},
"globals": {
- "mediaWiki": false
+ "require": false,
+ "module": false,
+ "mediaWiki": false,
+ "OO": false
},
"rules": {
- "no-undef": 0,
- "no-unneeded-ternary": 0,
"no-use-before-define": 0,
- "no-whitespace-before-property": 0,
- "operator-linebreak": 0,
- "semi-spacing": 0,
- "spaced-comment": 0,
"valid-jsdoc": 0,
- "wrap-iife": 0
+ "dot-notation": [ "error", { "allowKeywords": true } ]
}
}
diff --git a/resources/infrastructure/bannereditor.js
b/resources/infrastructure/bannereditor.js
index 6833461..35cb153 100644
--- a/resources/infrastructure/bannereditor.js
+++ b/resources/infrastructure/bannereditor.js
@@ -75,7 +75,7 @@
* @return {boolean}
*/
doSaveBanner: function () {
- /*global alert */
+ /* global alert */
if ( $( '#mw-input-wpbanner-body' ).prop( 'value'
).indexOf( 'document.write' ) > -1 ) {
alert( mw.msg(
'centralnotice-documentwrite-error' ) );
} else {
@@ -176,11 +176,11 @@
startPos,
endPos;
if ( buttonType === 'close' ) {
- buttonValue = '<a href="#" title="'
- + mw.msg( 'centralnotice-close-title' )
- + '"
onclick="mw.centralNotice.hideBanner();return false;">'
- + '<div class="cn-closeButton">' +
mw.msg( 'centralnotice-close-title' )
- + '</div></a>';
+ buttonValue = '<a href="#" title="' +
+ mw.msg( 'centralnotice-close-title' ) +
+ '"
onclick="mw.centralNotice.hideBanner();return false;">' +
+ '<div class="cn-closeButton">' +
mw.msg( 'centralnotice-close-title' ) +
+ '</div></a>';
}
if ( document.selection ) {
// IE support
@@ -191,9 +191,9 @@
// Mozilla support
startPos = bannerField.selectionStart;
endPos = bannerField.selectionEnd;
- bannerField.value =
bannerField.value.substring( 0, startPos )
- + buttonValue
- + bannerField.value.substring( endPos,
bannerField.value.length );
+ bannerField.value =
bannerField.value.substring( 0, startPos ) +
+ buttonValue +
+ bannerField.value.substring( endPos,
bannerField.value.length );
} else {
bannerField.value += buttonValue;
}
@@ -210,4 +210,4 @@
// And do some initial form work
$( '#cn-js-error-warn' ).hide();
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/infrastructure/bannermanager.js
b/resources/infrastructure/bannermanager.js
index 19c7de0..90fda7e 100644
--- a/resources/infrastructure/bannermanager.js
+++ b/resources/infrastructure/bannermanager.js
@@ -266,4 +266,4 @@
bm.checkAllStateAltered();
$( '#cn-js-error-warn' ).hide();
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/infrastructure/campaignManager.js
b/resources/infrastructure/campaignManager.js
index 8372310..af3acf8 100644
--- a/resources/infrastructure/campaignManager.js
+++ b/resources/infrastructure/campaignManager.js
@@ -280,4 +280,4 @@
updateThrottle();
updateWeightColumn();
updateBuckets();
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/infrastructure/centralnotice.js
b/resources/infrastructure/centralnotice.js
index 434b095..14081b5 100644
--- a/resources/infrastructure/centralnotice.js
+++ b/resources/infrastructure/centralnotice.js
@@ -123,4 +123,4 @@
}
} ).trigger( 'change' );
} );
-} )( mediaWiki, jQuery );
+}( mediaWiki, jQuery ) );
diff --git
a/resources/infrastructure/ext.centralNotice.adminUi.campaignPager.js
b/resources/infrastructure/ext.centralNotice.adminUi.campaignPager.js
index b78a36a..b5d53eb 100644
--- a/resources/infrastructure/ext.centralNotice.adminUi.campaignPager.js
+++ b/resources/infrastructure/ext.centralNotice.adminUi.campaignPager.js
@@ -153,4 +153,4 @@
$( '#cn-campaign-pager-submit' ).click( submitChanges );
}
} );
-} )( mediaWiki, jQuery );
+}( mediaWiki, jQuery ) );
diff --git a/resources/subscribing/ext.centralNotice.bannerHistoryLogger.js
b/resources/subscribing/ext.centralNotice.bannerHistoryLogger.js
index 0f1925d..852c0b2 100644
--- a/resources/subscribing/ext.centralNotice.bannerHistoryLogger.js
+++ b/resources/subscribing/ext.centralNotice.bannerHistoryLogger.js
@@ -75,9 +75,7 @@
time: time,
status: data.status,
statusCode: data.statusCode,
-
- bannersNotGuaranteedToDisplay:
- data.bannersNotGuaranteedToDisplay ?
true : false
+ bannersNotGuaranteedToDisplay: Boolean(
data.bannersNotGuaranteedToDisplay )
};
if ( data.banner ) {
@@ -403,4 +401,4 @@
}
};
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.display.bucketer.js
b/resources/subscribing/ext.centralNotice.display.bucketer.js
index 06a6500..9eec78e 100644
--- a/resources/subscribing/ext.centralNotice.display.bucketer.js
+++ b/resources/subscribing/ext.centralNotice.display.bucketer.js
@@ -315,4 +315,4 @@
storeBuckets();
}
};
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.display.chooser.js
b/resources/subscribing/ext.centralNotice.display.chooser.js
index 36c3782..218cd9c 100644
--- a/resources/subscribing/ext.centralNotice.display.chooser.js
+++ b/resources/subscribing/ext.centralNotice.display.chooser.js
@@ -85,7 +85,7 @@
}
if ( keepCampaign ) {
- filteredChoiceData.push( campaign ) ;
+ filteredChoiceData.push( campaign );
}
}
@@ -121,7 +121,7 @@
// and higher integers represent higher priority. These values
are
// defined by class constants in the CentralNotice PHP class.
- for ( i = 0; i < filteredChoiceData.length ; i++ ) {
+ for ( i = 0; i < filteredChoiceData.length; i++ ) {
campaign = filteredChoiceData[ i ];
campaignPriority = campaign.preferred;
@@ -364,4 +364,4 @@
}
};
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.display.hide.js
b/resources/subscribing/ext.centralNotice.display.hide.js
index 84505a7..1721681 100644
--- a/resources/subscribing/ext.centralNotice.display.hide.js
+++ b/resources/subscribing/ext.centralNotice.display.hide.js
@@ -140,4 +140,4 @@
hide.setHideCookies( 'close', durations.close );
}
};
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.display.js
b/resources/subscribing/ext.centralNotice.display.js
index 98ca610..22b7fa5 100644
--- a/resources/subscribing/ext.centralNotice.display.js
+++ b/resources/subscribing/ext.centralNotice.display.js
@@ -629,4 +629,4 @@
'Use mw.centralNotice method instead'
);
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.display.state.js
b/resources/subscribing/ext.centralNotice.display.state.js
index 9471406..22a62b0 100644
--- a/resources/subscribing/ext.centralNotice.display.state.js
+++ b/resources/subscribing/ext.centralNotice.display.state.js
@@ -114,7 +114,7 @@
UNKNOWN_COUNTRY_CODE;
// Some parameters should get through even if they have falsey
values
- state.data.debug = urlParams.debug !== undefined ? true : false;
+ state.data.debug = ( urlParams.debug !== undefined );
state.data.randomcampaign = urlParams.randomcampaign !==
undefined ?
urlParams.randomcampaign : Math.random();
@@ -402,4 +402,4 @@
return REASONS.other;
}
};
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.freegeoipLookup.js
b/resources/subscribing/ext.centralNotice.freegeoipLookup.js
index 6a199b9..e215aab 100644
--- a/resources/subscribing/ext.centralNotice.freegeoipLookup.js
+++ b/resources/subscribing/ext.centralNotice.freegeoipLookup.js
@@ -30,4 +30,4 @@
} );
};
-} )( jQuery );
+}( jQuery ) );
diff --git a/resources/subscribing/ext.centralNotice.geoIP.js
b/resources/subscribing/ext.centralNotice.geoIP.js
index 7ee4997..5e040f9 100644
--- a/resources/subscribing/ext.centralNotice.geoIP.js
+++ b/resources/subscribing/ext.centralNotice.geoIP.js
@@ -167,4 +167,4 @@
window.Geo = geo;
} );
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.impressionDiet.js
b/resources/subscribing/ext.centralNotice.impressionDiet.js
index fc1b848..f477d6b 100644
--- a/resources/subscribing/ext.centralNotice.impressionDiet.js
+++ b/resources/subscribing/ext.centralNotice.impressionDiet.js
@@ -80,8 +80,8 @@
counts = getCounts();
}
- if ( counts.waitUntil < new Date().getTime()
- && counts.waitSeenCount >= mixinParams.maximumSeen
+ if ( counts.waitUntil < new Date().getTime() &&
+ counts.waitSeenCount >= mixinParams.maximumSeen
) {
// We're beyond the wait period, and have nothing to do
except
// maybe start a new cycle.
@@ -161,7 +161,7 @@
}
rawWaitCookie = $.cookie( identifier + WAIT_COOKIE_SUFFIX );
- waitData = ( rawWaitCookie || '' ) .split( /[|]/ );
+ waitData = ( rawWaitCookie || '' ).split( /[|]/ );
cookieCounts = {
seenCount: parseInt( rawCookie, 10 ) || 0,
@@ -229,4 +229,4 @@
// Register the mixin
cn.registerCampaignMixin( mixin );
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.kvStore.js
b/resources/subscribing/ext.centralNotice.kvStore.js
index 673ac48..532ec65 100644
--- a/resources/subscribing/ext.centralNotice.kvStore.js
+++ b/resources/subscribing/ext.centralNotice.kvStore.js
@@ -524,4 +524,4 @@
}
};
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.kvStoreMaintenance.js
b/resources/subscribing/ext.centralNotice.kvStoreMaintenance.js
index 7cb9a86..5c20c80 100644
--- a/resources/subscribing/ext.centralNotice.kvStoreMaintenance.js
+++ b/resources/subscribing/ext.centralNotice.kvStoreMaintenance.js
@@ -129,4 +129,4 @@
}
};
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.largeBannerLimit.js
b/resources/subscribing/ext.centralNotice.largeBannerLimit.js
index 66d1a30..bb8fe59 100644
--- a/resources/subscribing/ext.centralNotice.largeBannerLimit.js
+++ b/resources/subscribing/ext.centralNotice.largeBannerLimit.js
@@ -162,4 +162,4 @@
// Register the mixin
cn.registerCampaignMixin( mixin );
-} )( mediaWiki );
+}( mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.legacySupport.js
b/resources/subscribing/ext.centralNotice.legacySupport.js
index d806123..39980a7 100644
--- a/resources/subscribing/ext.centralNotice.legacySupport.js
+++ b/resources/subscribing/ext.centralNotice.legacySupport.js
@@ -22,4 +22,4 @@
// Register the mixin
cn.registerCampaignMixin( mixin );
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
diff --git a/resources/subscribing/ext.centralNotice.startUp.js
b/resources/subscribing/ext.centralNotice.startUp.js
index 0b3ec38..f27f733 100644
--- a/resources/subscribing/ext.centralNotice.startUp.js
+++ b/resources/subscribing/ext.centralNotice.startUp.js
@@ -102,4 +102,4 @@
} );
}
-} )( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/344732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6593499f954040ee654fbe3b302be37928f063a0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG <andrew.green...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
