jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344675 )
Change subject: build: Enable eslint rule 'no-multi-spaces' and make pass
......................................................................
build: Enable eslint rule 'no-multi-spaces' and make pass
Change-Id: I80550be6fcd035800be32960bc06e1bf726e9a24
---
M .eslintrc.json
M resources/subscribing/ext.centralNotice.display.chooser.js
M resources/subscribing/ext.centralNotice.geoIP.js
M resources/subscribing/ext.centralNotice.largeBannerLimit.js
M resources/subscribing/ext.centralNotice.startUp.js
5 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
AndyRussG: Looks good to me, approved
diff --git a/.eslintrc.json b/.eslintrc.json
index 2f8c9a1..a4c4339 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -11,7 +11,6 @@
"mediaWiki": false
},
"rules": {
- "no-multi-spaces": 0,
"no-undef": 0,
"no-unneeded-ternary": 0,
"no-use-before-define": 0,
diff --git a/resources/subscribing/ext.centralNotice.display.chooser.js
b/resources/subscribing/ext.centralNotice.display.chooser.js
index 4c8c517..36c3782 100644
--- a/resources/subscribing/ext.centralNotice.display.chooser.js
+++ b/resources/subscribing/ext.centralNotice.display.chooser.js
@@ -43,7 +43,7 @@
// Check choice data freshness
campaignEndDatePlusLeeway = new Date();
campaignEndDatePlusLeeway.setTime(
- ( campaign.end * 1000 ) +
+ ( campaign.end * 1000 ) +
( CAMPAIGN_STALENESS_LEEWAY * 60000 )
);
diff --git a/resources/subscribing/ext.centralNotice.geoIP.js
b/resources/subscribing/ext.centralNotice.geoIP.js
index 4062fa9..7ee4997 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.largeBannerLimit.js
b/resources/subscribing/ext.centralNotice.largeBannerLimit.js
index 91d1f60..66d1a30 100644
--- a/resources/subscribing/ext.centralNotice.largeBannerLimit.js
+++ b/resources/subscribing/ext.centralNotice.largeBannerLimit.js
@@ -134,7 +134,7 @@
checkFlag()
) {
if ( mixinParams.randomize ) {
- cn.setBucket( Math.floor( Math.random() * 2 )
+ 2 );
+ cn.setBucket( Math.floor( Math.random() * 2 ) +
2 );
} else {
cn.setBucket( cn.getDataProperty( 'bucket' ) +
2 );
}
diff --git a/resources/subscribing/ext.centralNotice.startUp.js
b/resources/subscribing/ext.centralNotice.startUp.js
index 3d8fed5..0b3ec38 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/344675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80550be6fcd035800be32960bc06e1bf726e9a24
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
