jenkins-bot has submitted this change and it was merged.
Change subject: build: Enable three more minor jscs rules
......................................................................
build: Enable three more minor jscs rules
Change-Id: Id778ec1a89694effe59be1ec2ea2957a81a18123
---
M .jscsrc
M resources/mw.FlickrChecker.js
M resources/mw.UploadWizardDetails.js
M resources/ui/uw.ui.Wizard.js
4 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscsrc b/.jscsrc
index b201044..23243e6 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,10 +1,7 @@
{
"preset": "wikimedia",
- "disallowImplicitTypeConversion": null,
- "disallowNewlineBeforeBlockStatements": null,
"jsDoc": null,
- "requireDotNotation": null,
"requireVarDeclFirst": null,
"excludeFiles": [ "resources/jquery/**" ]
diff --git a/resources/mw.FlickrChecker.js b/resources/mw.FlickrChecker.js
index 5ac6d27..47df832 100644
--- a/resources/mw.FlickrChecker.js
+++ b/resources/mw.FlickrChecker.js
@@ -629,8 +629,11 @@
} ).done( function ( data ) {
var nameParts, newUpload;
- if ( typeof data.sizes !== 'undefined' &&
typeof data.sizes.size !== 'undefined' && data.sizes.size.length > 0 )
- {
+ if (
+ typeof data.sizes !== 'undefined' &&
+ typeof data.sizes.size !== 'undefined'
&&
+ data.sizes.size.length > 0
+ ) {
// Flickr always returns the largest
version as the final size.
// TODO: Make this less fragile by
actually comparing sizes.
largestSize = data.sizes.size.pop();
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index 15b1553..3ce7f55 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -680,7 +680,7 @@
var currentTitle = $( this ).val();
currentTitle = titleZero.replace(
/(\D+)(\d{1,3})(\D*)$/,
function ( str, m1, m2, m3 ) {
- var newstr = ( +m2 + i
+ 1 ) + '';
+ var newstr = String(
+m2 + i + 1 );
return m1 + new Array(
m2.length + 1 - newstr.length )
.join( '0' ) +
newstr + m3;
}
@@ -1164,7 +1164,7 @@
prefillDate: function () {
// XXX surely we have this function somewhere already
function pad( n ) {
- return n < 10 ? '0' + n : '' + n;
+ return ( n < 10 ? '0' : '' ) + String( n );
}
function getSaneTime( date ) {
diff --git a/resources/ui/uw.ui.Wizard.js b/resources/ui/uw.ui.Wizard.js
index 142370f..0744bfd 100644
--- a/resources/ui/uw.ui.Wizard.js
+++ b/resources/ui/uw.ui.Wizard.js
@@ -88,11 +88,14 @@
if ( typeof configAltUploadForm === 'object' ) {
userLanguage = mw.config.get( 'wgUserLanguage' );
+ // Not using .default for ES3 support (IE8)
+ // jscs: disable requireDotNotation
if ( configAltUploadForm[ userLanguage ] ) {
altUploadForm = configAltUploadForm[
userLanguage ];
} else if ( configAltUploadForm[ 'default' ] ) {
altUploadForm = configAltUploadForm[ 'default'
];
}
+ // jscs: enable requireDotNotation
} else {
altUploadForm = configAltUploadForm;
}
--
To view, visit https://gerrit.wikimedia.org/r/247733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id778ec1a89694effe59be1ec2ea2957a81a18123
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
