jenkins-bot has submitted this change and it was merged.
Change subject: Update linters and checkers
......................................................................
Update linters and checkers
Change-Id: I9de589a841d6d8a91255095b364e23f6756cb974
---
A .jscsrc
M .jshintrc
M Gruntfile.js
M package.json
M resources/js/ext.translate.mainpage.js
M resources/js/ext.translate.mainpage.signup.js
6 files changed, 30 insertions(+), 25 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 0000000..9d22e3f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+ "preset": "wikimedia"
+}
diff --git a/.jshintrc b/.jshintrc
index ce29904..31ce942 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,25 +1,16 @@
{
- "camelcase": true,
+ "bitwise": true,
"curly": true,
"eqeqeq": true,
- "immed": true,
+ "forin": false,
+ "freeze": true,
"latedef": true,
- "newcap": true,
"noarg": true,
- "noempty": true,
"nonew": true,
- "quotmark": "single",
- "trailing": true,
+ "onevar": true,
+ "strict": true,
"undef": true,
"unused": true,
- "onevar": true,
- "bitwise": true,
- "forin": false,
- "regexp": false,
- "strict": false,
- "laxbreak": true,
- "smarttabs": true,
- "multistr": true,
"browser": true,
"predef": [
"mediaWiki",
diff --git a/Gruntfile.js b/Gruntfile.js
index 171195a..a832fd1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,8 +1,11 @@
/*jshint node:true */
module.exports = function ( grunt ) {
+ 'use strict';
+
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
- grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
jshint: {
@@ -10,20 +13,24 @@
jshintrc: true
},
all: [
- '*.js'
+ '**/*.js',
+ '!node_modules/**'
]
},
- banana: {
- all: 'i18n/'
+ jscs: {
+ src: '<%= jshint.all %>'
},
jsonlint: {
all: [
'**/*.json',
'!node_modules/**'
]
+ },
+ banana: {
+ all: 'i18n/'
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index adb58d3..d6d0f28 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-contrib-jshint": "0.11.3",
- "grunt-banana-checker": "0.2.2",
+ "grunt-banana-checker": "0.4.0",
+ "grunt-jscs": "2.5.0",
"grunt-jsonlint": "1.0.7"
}
}
diff --git a/resources/js/ext.translate.mainpage.js
b/resources/js/ext.translate.mainpage.js
index 4fde66a..78d68e3 100644
--- a/resources/js/ext.translate.mainpage.js
+++ b/resources/js/ext.translate.mainpage.js
@@ -1,5 +1,6 @@
-/**
+/*!
* Dynamic behavior for the main page
+ *
* @author Niklas Laxström
* @license GPL-2.0+
*/
@@ -12,7 +13,7 @@
function setupStatsTiles() {
var $tiles = $( '.stats-tile' ).not( '.unused' );
- $tiles.click( function( e ) {
+ $tiles.click( function ( e ) {
e.stopPropagation();
location.href = $( this ).find( 'a' ).prop( 'href' );
} );
@@ -101,7 +102,7 @@
$( '.twn-mainpage-project-tiles' ).before(
$sameLanguageULSTrigger );
- delete sameLanguageULSLanguages[sourceLanguage];
+ delete sameLanguageULSLanguages[ sourceLanguage ];
$sameLanguageULSTrigger.uls( {
languages: sameLanguageULSLanguages,
top: '20%',
diff --git a/resources/js/ext.translate.mainpage.signup.js
b/resources/js/ext.translate.mainpage.signup.js
index 65f453b..6cee1fd 100644
--- a/resources/js/ext.translate.mainpage.signup.js
+++ b/resources/js/ext.translate.mainpage.signup.js
@@ -1,4 +1,4 @@
-/**
+/*!
* Handle the signup thingie.
*
* @author Niklas Laxström
@@ -87,8 +87,9 @@
/**
* Account creation can fail on invalid user input.
+ *
* @param {string} errorcode Error code as returned by MW api
- * @param {object} result Result retuned by MW api
+ * @param {Object} result Result retuned by MW api
*/
function handleAccountCreationFailure( errorcode, result ) {
var $element = $( [] );
@@ -131,6 +132,7 @@
/**
* Handles the chain of many ajax requests when user submits
the signup form.
+ *
* @param {jQuery.Event} e
*/
function handleSubmit( e ) {
--
To view, visit https://gerrit.wikimedia.org/r/270956
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9de589a841d6d8a91255095b364e23f6756cb974
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwnMainPage
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
