jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/351103 )
Change subject: Change from jshint to eslint
......................................................................
Change from jshint to eslint
Change-Id: I9d8a31c8048f9d80e8395a637573272ca5f9fea5
---
A .eslintrc.json
D .jshintrc
M Gruntfile.js
M modules/ext.categoryTree.js
M package.json
5 files changed, 21 insertions(+), 35 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..4843240
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "browser": true,
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false
+ }
+}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 1dad4f0..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "es3": true,
- "freeze": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Relaxing
- "laxbreak": true,
- "multistr": true,
-
- // Environment
- "browser": true,
-
- "globals": {
- "mediaWiki": true,
- "jQuery": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 6f3befc..d985906 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,22 +4,21 @@
* @package CategoryTree
*/
-/*jshint node:true */
+/* eslint-env node */
module.exports = function ( grunt ) {
grunt.loadNpmTasks( 'grunt-jsonlint' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
banana: {
- all: ['i18n/']
+ all: [ 'i18n/' ]
},
- jshint: {
+ eslint: {
all: [
'**/*.js',
- '!node_modules/**',
- '!vendor/**'
+ '!node_modules/**'
]
},
jsonlint: {
@@ -37,6 +36,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'jshint',
'stylelint' ] );
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'eslint',
'stylelint' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/ext.categoryTree.js b/modules/ext.categoryTree.js
index f3fb56f..fa3c4b6 100644
--- a/modules/ext.categoryTree.js
+++ b/modules/ext.categoryTree.js
@@ -8,6 +8,8 @@
* @licence GNU General Public Licence 2.0 or later
*/
+/* eslint no-use-before-define: ["error", { "functions": false }] */
+
( function ( $, mw ) {
mw.hook( 'wikipage.content' ).add( function ( $content ) {
@@ -23,9 +25,8 @@
* Handles clicks on the expand buttons, and calls the
appropriate function
*
* @context {Element} CategoryTreeToggle
- * @param e {jQuery.Event}
*/
- function handleNode( /*e*/ ) {
+ function handleNode() {
var $link = $( this );
if ( $link.data( 'ct-state' ) === 'collapsed' ) {
expandNode( $link );
diff --git a/package.json b/package.json
index 359909b..8552d1c 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,10 @@
"test": "grunt test"
},
"devDependencies": {
+ "eslint-config-wikimedia": "0.3.0",
"grunt": "1.0.1",
"grunt-banana-checker": "0.4.0",
- "grunt-contrib-jshint": "1.1.0",
+ "grunt-eslint": "19.0.0",
"grunt-jsonlint": "1.0.7",
"grunt-stylelint": "0.6.0",
"stylelint-config-wikimedia": "0.4.1"
--
To view, visit https://gerrit.wikimedia.org/r/351103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d8a31c8048f9d80e8395a637573272ca5f9fea5
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CategoryTree
Gerrit-Branch: master
Gerrit-Owner: Fomafix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
