jenkins-bot has submitted this change and it was merged.
Change subject: Code quality: Remove jscs "disallowQuotedKeysInObjects"
over-ride and make pass
......................................................................
Code quality: Remove jscs "disallowQuotedKeysInObjects" over-ride and make pass
Change-Id: I120a213440ca9d48a773ef0a7b695857d7776cf8
---
M .jscsrc
M .jshintrc
M resources/jquery/jquery.morphCrossfade.js
M resources/jquery/jquery.mwCoolCats.js
M resources/jquery/jquery.validate.wmCommonsBlacklist.js
M resources/mw.ApiUploadHandler.js
M resources/mw.DestinationChecker.js
M resources/mw.Firefogg.js
M resources/mw.FirefoggTransport.js
M resources/mw.FlickrChecker.js
M resources/mw.UploadWizard.js
M resources/mw.UploadWizardDeed.js
M resources/mw.UploadWizardDetails.js
M resources/mw.UploadWizardLicenseInput.js
M resources/mw.UploadWizardUpload.js
M resources/ui/uw.ui.Thanks.js
16 files changed, 88 insertions(+), 84 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscsrc b/.jscsrc
index f557134..5045b01 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -4,6 +4,5 @@
"requireMultipleVarDecl": null,
"disallowDanglingUnderscores": null,
"requireCamelCaseOrUpperCaseIdentifiers": null,
- "disallowQuotedKeysInObjects": null,
"requireSpacesInsideArrayBrackets": null
}
diff --git a/.jshintrc b/.jshintrc
index 5b3b544..4d3b65f 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -22,7 +22,6 @@
// Enforcing
"bitwise": true,
- "es3": true,
"forin": false,
"regexp": false,
"strict": false,
diff --git a/resources/jquery/jquery.morphCrossfade.js
b/resources/jquery/jquery.morphCrossfade.js
index b8684de..0c4dda2 100644
--- a/resources/jquery/jquery.morphCrossfade.js
+++ b/resources/jquery/jquery.morphCrossfade.js
@@ -81,7 +81,7 @@
speed = 400;
}
- $containers.css( { 'overflow': 'hidden' } );
+ $containers.css( { overflow:'hidden' } );
$.each( $containers, function ( i, container ) {
var $container = $( container );
diff --git a/resources/jquery/jquery.mwCoolCats.js
b/resources/jquery/jquery.mwCoolCats.js
index cdfc241..25e1349 100644
--- a/resources/jquery/jquery.mwCoolCats.js
+++ b/resources/jquery/jquery.mwCoolCats.js
@@ -215,15 +215,15 @@
_this.addClass( 'categoryInput' );
_this.suggestions( {
- 'fetch': _fetchSuggestions,
- 'cancel': function () {
+ fetch:_fetchSuggestions,
+ cancel:function () {
var req = $( this ).data( 'request' );
// XMLHttpRequest.abort is unimplemented in
IE6, also returns nonstandard value of "unknown" for typeof
if ( req && ( typeof req.abort !== 'unknown' )
&& ( typeof req.abort !== 'undefined' ) && req.abort ) {
req.abort();
}
},
- 'result': { 'select': function () {
+ result:{ select:function () {
_processInput( _this );
} }
} );
diff --git a/resources/jquery/jquery.validate.wmCommonsBlacklist.js
b/resources/jquery/jquery.validate.wmCommonsBlacklist.js
index 03e9b5c..7ff8de5 100644
--- a/resources/jquery/jquery.validate.wmCommonsBlacklist.js
+++ b/resources/jquery/jquery.validate.wmCommonsBlacklist.js
@@ -18,7 +18,7 @@
var regexSets = {
- 'titleBadchars': [
+ titleBadchars:[
/[\u00A0\u1680\u180E\u2000-\u200B\u2028\u2029\u202F\u205F\u3000]/, // NBSP and
other unusual spaces
/[\u202A-\u202E]/, // BiDi overrides
/[\x00-\x1f]/, // Control characters
@@ -30,7 +30,7 @@
],
// note lack of extension, since we test title without
extension.
- 'titleSenselessimagename': [
+ titleSenselessimagename:[
/^DCP[\d\s]+$/i, // Kodak
/^DSC.[\d\s]+$/i, // [[w:Design rule for Camera File
system]] (Nikon, Fuji, Polaroid)
/^MVC-?[\d\s]+$/i, // Sony Mavica
@@ -49,11 +49,11 @@
/^SANY[\d\s]+$/ // Sanyo
],
- 'titleThumbnail': [
+ titleThumbnail:[
/^\d+px-.*/
],
- 'titleExtension': [
+ titleExtension:[
/\.(jpe?g|png|gif|svg|ogg|ogv|oga)$/
]
diff --git a/resources/mw.ApiUploadHandler.js b/resources/mw.ApiUploadHandler.js
index 105d695..1e5dd5f 100644
--- a/resources/mw.ApiUploadHandler.js
+++ b/resources/mw.ApiUploadHandler.js
@@ -85,7 +85,7 @@
*/
addFormInputIfMissing: function ( name, value ) {
if ( this.$form.find( '[name="' + name + '"]' ).length
=== 0 ) {
- this.$form.append( $( '<input type="hidden" />'
) .attr( { 'name': name, 'value': value } ));
+ this.$form.append( $( '<input type="hidden" />'
) .attr( { name:name, value:value } ));
}
},
diff --git a/resources/mw.DestinationChecker.js
b/resources/mw.DestinationChecker.js
index db02491..91ea26b 100644
--- a/resources/mw.DestinationChecker.js
+++ b/resources/mw.DestinationChecker.js
@@ -136,7 +136,7 @@
/**
* Async check if a title is in the titleblacklist.
- * @param {Function} takes object, like { 'blacklist': result }
+ * @param {Function} takes object, like { blacklist:result }
* @param {string} title the blacklist should be checked against
*/
checkBlacklist: function ( callback, title ) {
@@ -146,18 +146,18 @@
var result;
if ( blacklistResult === false ) {
- result = { 'notBlacklisted': true };
+ result = { notBlacklisted:true };
} else {
result = {
- 'notBlacklisted': false,
- 'blacklistReason':
blacklistResult.reason,
- 'blacklistMessage':
blacklistResult.message,
- 'blacklistLine':
blacklistResult.line
+ notBlacklisted:false,
+
blacklistReason:blacklistResult.reason,
+
blacklistMessage:blacklistResult.message,
+
blacklistLine:blacklistResult.line
};
}
checker.cachedBlacklist[title] = result;
- callback( { 'blacklist': result } );
+ callback( { blacklist:result } );
}
if ( title === '' ) {
@@ -165,7 +165,7 @@
}
if ( this.cachedBlacklist[title] !== undefined ) {
- callback( { 'blacklist':
this.cachedBlacklist[title] } );
+ callback( {
blacklist:this.cachedBlacklist[title] } );
return;
}
@@ -184,7 +184,7 @@
/**
* Async check if a filename is unique. Can be attached to a
field's change() event
* This is a more abstract version of
AddMedia/UploadHandler.js::doDestCheck
- * @param {Function} takes object, like { 'unique': result }
+ * @param {Function} takes object, like { unique:result }
* @param {string} title the uniqueness should be checked for
*/
checkUnique: function ( callback, title ) {
@@ -263,7 +263,7 @@
}
checker.cachedResult[title] = result;
- callback( { 'unique': result } );
+ callback( { unique:result } );
}
function err( code ) {
@@ -274,11 +274,11 @@
// Setup the request -- will return thumbnail data if
it finds one
// XXX do not use iiurlwidth as it will create a
thumbnail
params = {
- 'titles': title,
- 'prop': 'info|imageinfo',
- 'inprop': 'protection',
- 'iiprop': 'url|mime|size',
- 'iiurlwidth': 150
+ titles:title,
+ prop:'info|imageinfo',
+ inprop:'protection',
+ iiprop:'url|mime|size',
+ iiurlwidth:150
};
// if input is empty or invalid, don't bother.
@@ -287,7 +287,7 @@
}
if ( this.cachedResult[title] !== undefined ) {
- callback( { 'unique': this.cachedResult[title]
} );
+ callback( { unique:this.cachedResult[title] } );
return;
}
diff --git a/resources/mw.Firefogg.js b/resources/mw.Firefogg.js
index 5708d8f..b1e6222 100644
--- a/resources/mw.Firefogg.js
+++ b/resources/mw.Firefogg.js
@@ -3,9 +3,9 @@
mw.Firefogg = {
firefoggInstallLinks: {
- 'macosx': 'http://firefogg.org/macosx/Firefogg.xpi',
- 'win32': 'http://firefogg.org/win32/Firefogg.xpi',
- 'linux': 'http://firefogg.org/linux/Firefogg.xpi'
+ macosx:'http://firefogg.org/macosx/Firefogg.xpi',
+ win32:'http://firefogg.org/win32/Firefogg.xpi',
+ linux:'http://firefogg.org/linux/Firefogg.xpi'
},
/**
diff --git a/resources/mw.FirefoggTransport.js
b/resources/mw.FirefoggTransport.js
index 389bd53..9c46bca 100644
--- a/resources/mw.FirefoggTransport.js
+++ b/resources/mw.FirefoggTransport.js
@@ -161,7 +161,7 @@
*/
getEncodeSettings: function () {
if ( this.isUploadFormat() ) {
- return { 'passthrough': true };
+ return { passthrough:true };
}
// Get the default encode settings:
var encodeSettings =
mw.UploadWizard.config.firefoggEncodeSettings;
diff --git a/resources/mw.FlickrChecker.js b/resources/mw.FlickrChecker.js
index 42f13d0..ffa7e49 100644
--- a/resources/mw.FlickrChecker.js
+++ b/resources/mw.FlickrChecker.js
@@ -367,8 +367,8 @@
license: true,
photoId: item.id,
location: {
- 'latitude':
item.latitude,
- 'longitude':
item.longitude
+ latitude:item.latitude,
+ longitude:item.longitude
},
author: item.ownername,
date: item.datetaken,
diff --git a/resources/mw.UploadWizard.js b/resources/mw.UploadWizard.js
index 1ea66a0..27840b1 100644
--- a/resources/mw.UploadWizard.js
+++ b/resources/mw.UploadWizard.js
@@ -1093,12 +1093,12 @@
var api = this.api,
isComplete = false,
tokenRequest = {
- 'action': 'tokens',
- 'type': 'options'
+ action:'tokens',
+ type:'options'
},
prefRequest = {
- 'action': 'options',
- 'change': 'upwiz_skiptutorial=1'
+ action:'options',
+ change:'upwiz_skiptutorial=1'
};
var allowCloseWindow = mw.confirmCloseWindow( {
@@ -1244,7 +1244,7 @@
contentSource = fn;
html = true;
} else {
- attrs = { 'title': mw.message( 'mwe-upwiz-tooltip-' +
key ).escaped() };
+ attrs = { title:mw.message( 'mwe-upwiz-tooltip-' + key
).escaped() };
contentSource = 'title';
}
return this.append(
diff --git a/resources/mw.UploadWizardDeed.js b/resources/mw.UploadWizardDeed.js
index dbb4775..e74ccdc 100644
--- a/resources/mw.UploadWizardDeed.js
+++ b/resources/mw.UploadWizardDeed.js
@@ -173,7 +173,7 @@
mw.UploadWizard.config.licenses[defaultLicense].url + 'deed.' + languageCode;
defaultLicenseMsg =
'mwe-upwiz-source-ownwork-assert-' + defaultLicense;
defaultLicenseExplainMsg =
'mwe-upwiz-source-ownwork-' + defaultLicense + '-explain';
- defaultLicenseLink = $( '<a>' ).attr( {
'target': '_blank', 'href': defaultLicenseURL } );
+ defaultLicenseLink = $( '<a>' ).attr( {
target:'_blank', href:defaultLicenseURL } );
this.$form = $( '<form>' );
this.$authorInput2 = $( '<input type="text" />'
).attr( { name: 'author2' } ).addClass( 'mwe-upwiz-sign' );
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index 58ec9d2..2048288 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -93,7 +93,7 @@
function makeAndAppendTitleErrorLabel( labelClass ) {
$( '<label>' )
.attr( {
- 'for': details.titleId,
+ for: details.titleId,
generated: 'true'
} )
.addClass( 'mwe-error ' + labelClass )
@@ -130,7 +130,7 @@
'<div class="mwe-upwiz-details-input"></div>' +
'</div>'
);
- commonsCategoriesLink = $( '<a>' ).attr( { 'target': '_blank',
'href': 'http://commons.wikimedia.org/wiki/Commons:Categories' } );
+ commonsCategoriesLink = $( '<a>' ).attr( { target:'_blank',
href:'http://commons.wikimedia.org/wiki/Commons:Categories' } );
categoriesHint = $( '<span>' ).msg(
'mwe-upwiz-tooltip-categories', commonsCategoriesLink ).html();
categoriesHinter = function () { return categoriesHint; };
$categoriesDiv
@@ -243,9 +243,9 @@
if ( field.type === 'select' ) {
$fieldInput = $( '<select>' ).attr( {
- 'id': fieldInputId,
- 'name': fieldInputId,
- 'class': 'mwe-idfield'
+ id: fieldInputId,
+ name: fieldInputId,
+ class: 'mwe-idfield'
} ).data( 'field', field );
if ( 'options' in field ) {
@@ -257,10 +257,10 @@
}
} else {
$fieldInput = $( '<input type="text">'
).attr( {
- 'id': fieldInputId,
- 'name': fieldInputId,
- 'class': 'mwe-idfield',
- 'maxlength': field.maxLength
+ id: fieldInputId,
+ name: fieldInputId,
+ class: 'mwe-idfield',
+ maxlength: field.maxLength
} )
.val( field.initialValue )
.data( 'field', field );
@@ -268,7 +268,7 @@
details.$form.append(
$( '<div>' ).attr( 'class',
'mwe-upwiz-details-input-error' )
- .append( $( '<label>' ).attr( {
'class': 'mwe-validator-error', 'for': fieldInputId, 'generated': 'true' } ) )
+ .append( $( '<label>' ).attr( {
class: 'mwe-validator-error', for: fieldInputId, generated: 'true' } ) )
);
if ( field.required ) {
details.$form.append( $( '<div>'
).attr( 'class', 'mwe-upwiz-details-fieldname' ).html( field.label
).requiredFieldLabel() );
@@ -331,7 +331,7 @@
.on( 'input keyup change cut paste', function () {
var link = details.osmMapLink();
if ( $list.valid() ) {
- showMap.attr( { 'href':link,
'target':'_blank' } ).show();
+ showMap.attr( { href: link, target:
'_blank' } ).show();
} else {
showMap.hide();
}
@@ -1318,12 +1318,18 @@
// can we be more slick and do this
with maps, applys, joins?
information = {
- 'description': '',
// {{lang|description in lang}}* required
- 'date': '',
// YYYY, YYYY-MM, or YYYY-MM-DD required - use jquery but allow editing, then
double check for sane date.
- 'source': '',
// {{own}} or wikitext optional
- 'author': '',
// any wikitext, but particularly {{Creator:Name Surname}} required
- 'permission': '',
// leave blank unless OTRS pending; by default will be "see below" optional
- 'other_versions': '' // pipe
separated list, other versions optional
+ // {{lang|description in
lang}}* required
+ description: '',
+ // YYYY, YYYY-MM, or YYYY-MM-DD
required - use jquery but allow editing, then double check for sane date.
+ date: '',
+ // {{own}} or wikitext optional
+ source: '',
+ // any wikitext, but
particularly {{Creator:Name Surname}} required
+ author: '',
+ // leave blank unless OTRS
pending; by default will be "see below" optional
+ permission: '',
+ // pipe separated list, other
versions optional
+ 'other versions': ''
};
// sanity check the descriptions -- do not have
two in the same lang
@@ -1354,7 +1360,7 @@
info = '';
for ( key in information ) {
- info += '|' + key + '=' +
information[key] + '\n';
+ info += '|' + key.replace( /:/g, '_' )
+ '=' + information[key] + '\n';
}
wikiText += '=={{int:filedesc}}==\n';
@@ -1562,13 +1568,13 @@
var statusKey, comma,
statusLine = mw.message(
'api-error-unclassified' ).text(),
titleErrorMap = {
- 'senselessimagename':
'senselessimagename',
+ senselessimagename:
'senselessimagename',
'fileexists-shared-forbidden':
'fileexists-shared-forbidden',
'titleblacklist-custom-filename':
'hosting',
'titleblacklist-custom-SVG-thumbnail':
'thumbnail',
'titleblacklist-custom-thumbnail':
'thumbnail',
'titleblacklist-custom-double-apostrophe': 'double-apostrophe',
- 'protectedpage': 'protected'
+ protectedpage: 'protected'
};
if ( result && result.error && result.error.code ) {
diff --git a/resources/mw.UploadWizardLicenseInput.js
b/resources/mw.UploadWizardLicenseInput.js
index dd42899..785cf1f 100644
--- a/resources/mw.UploadWizardLicenseInput.js
+++ b/resources/mw.UploadWizardLicenseInput.js
@@ -64,7 +64,7 @@
this.$spinner = $( '<div></div>' )
.addClass( 'mwe-upwiz-status-progress
mwe-upwiz-file-indicator' )
- .css( { 'width': 200, 'padding': 20, 'float': 'none',
'margin': '0 auto' } );
+ .css( { width: 200, padding: 20, float: 'none', margin:
'0 auto' } );
};
mw.UploadWizardLicenseInput.prototype = {
@@ -90,7 +90,7 @@
.addClass(
'mwe-upwiz-deed-license-group-head mwe-upwiz-toggler' )
.msg( group.head,
input.count )
);
- $body = $( '<div></div>' ).addClass(
'mwe-upwiz-toggler-content' ).css( { 'marginBottom': '1em' } );
+ $body = $( '<div></div>' ).addClass(
'mwe-upwiz-toggler-content' ).css( { marginBottom: '1em' } );
$toggler = $group.append( $head, $body
).collapseToggle();
}
@@ -217,7 +217,7 @@
// that it's misisng.
licenseURL = license.props.url === undefined ?
'#missing license URL' : license.props.url,
- licenseLink = $( '<a>' ).attr( { 'target':
'_blank', 'href': licenseURL } ),
+ licenseLink = $( '<a>' ).attr( { target:
'_blank', href: licenseURL } ),
$icons = $( '<span></span>' );
@@ -230,7 +230,7 @@
} );
}
return $( '<label />' )
- .attr( { 'for': $input.attr('id') } )
+ .attr( { for: $input.attr('id') } )
.msg( messageKey, this.count || 0, licenseLink )
.append( $icons ).addClass(
'mwe-upwiz-copyright-info' );
},
@@ -258,20 +258,20 @@
);
} )
.css( {
- 'width': '100%',
+ width: '100%',
'font-family': 'monospace'
} ),
$button = $( '<span></span>' )
.button( { label: mw.message(
'mwe-upwiz-license-custom-preview' ).escaped() } )
- .css( { 'width': '8em' } )
+ .css( { width: '8em' } )
.click( function () {
input.showPreview( $textarea.val() ); } );
- return $( '<div></div>' ).css( { 'width': '100%' }
).append(
+ return $( '<div></div>' ).css( { width: '100%' }
).append(
$( '<div><label for="' + nameId + '"
class="mwe-error mwe-error-textarea"></label></div>' ),
- $( '<div></div>' ).css( { 'float': 'right',
'width': '9em', 'padding-left': '1em' } ).append( $button ),
+ $( '<div></div>' ).css( { float: 'right',
width: '9em', 'padding-left': '1em' } ).append( $button ),
$( '<div></div>' ).css( { 'margin-right':
'10em' } ).append( $textarea ),
- $( '<div></div>' ).css( { 'clear':'both' } )
+ $( '<div></div>' ).css( { clear: 'both' } )
);
},
@@ -307,7 +307,7 @@
/**
* Sets the value(s) of a license input. This is a little bit
klugey because it relies on an inverted dict, and in some
* cases we are now letting license inputs create multiple
templates.
- * @param object of license-key to boolean values, e.g. {
'cc_by_sa_30': true, 'gfdl': true, 'flickrreview|cc_by_sa_30': false }
+ * @param object of license-key to boolean values, e.g. {
'cc_by_sa_30': true, gfdl: true, 'flickrreview|cc_by_sa_30': false }
*/
setValues: function ( values ) {
var trueCount, trueLicenseName,
diff --git a/resources/mw.UploadWizardUpload.js
b/resources/mw.UploadWizardUpload.js
index 5427093..7514ca5 100644
--- a/resources/mw.UploadWizardUpload.js
+++ b/resources/mw.UploadWizardUpload.js
@@ -318,7 +318,7 @@
try {
href = new mw.Title( filename, fileNsId
).getUrl();
- $a.attr( { 'href': href, 'target': '_blank' } );
+ $a.attr( { href:href, target:'_blank' } );
} catch ( e ) {
$a.click( function () { window.alert('could not
parse filename=' + filename ); } );
$a.attr( 'href', '#' );
@@ -729,9 +729,9 @@
*/
UWUP.getStashImageInfo = function ( callback, props, width, height ) {
var params = {
- 'prop': 'stashimageinfo',
- 'siifilekey': this.fileKey,
- 'siiprop': props.join( '|' )
+ prop: 'stashimageinfo',
+ siifilekey: this.fileKey,
+ siiprop: props.join( '|' )
};
function ok( data ) {
@@ -807,9 +807,9 @@
var requestedTitle = this.title.getPrefixedText(),
params = {
- 'prop': 'imageinfo',
- 'titles': requestedTitle,
- 'iiprop': props.join( '|' )
+ prop:'imageinfo',
+ titles:requestedTitle,
+ iiprop:props.join( '|' )
};
if ( width !== undefined || height !== undefined ) {
@@ -1174,12 +1174,12 @@
$( '<div class="mwe-upwiz-lightbox"></div>' )
.append( $imgDiv )
.dialog( {
- 'minWidth':
mw.UploadWizard.config.largeThumbnailWidth,
- 'minHeight':
mw.UploadWizard.config.largeThumbnailMaxHeight,
- 'autoOpen': true,
- 'title': mw.message(
'mwe-upwiz-image-preview' ).escaped(),
- 'modal': true,
- 'resizable': false
+
minWidth:mw.UploadWizard.config.largeThumbnailWidth,
+
minHeight:mw.UploadWizard.config.largeThumbnailMaxHeight,
+ autoOpen:true,
+ title:mw.message(
'mwe-upwiz-image-preview' ).escaped(),
+ modal:true,
+ resizable:false
} );
upload.setThumbnail(
$imgDiv,
diff --git a/resources/ui/uw.ui.Thanks.js b/resources/ui/uw.ui.Thanks.js
index da6952e..305efd7 100644
--- a/resources/ui/uw.ui.Thanks.js
+++ b/resources/ui/uw.ui.Thanks.js
@@ -109,8 +109,8 @@
// Set the thumbnail links so that they point to the image
description page
$thumbnailLink.add( $thumbnailDiv.find(
'.mwe-upwiz-thumbnail-link' ) ).attr( {
- 'href': upload.imageinfo.descriptionurl,
- 'target': '_blank'
+ href:upload.imageinfo.descriptionurl,
+ target:'_blank'
} );
this.$div.find( '.mwe-upwiz-buttons' ).before( $thanksDiv );
--
To view, visit https://gerrit.wikimedia.org/r/159952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I120a213440ca9d48a773ef0a7b695857d7776cf8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
