From 41b9f5d2e7eb75a5575d368676e023885770f4fd Mon Sep 17 00:00:00 2001 From: Paladox Date: Tue, 19 Jan 2016 22:21:07 +0000 Subject: [PATCH] Add grunt-contrib-jshint to npm Change-Id: I6bcf5c2b98e918f675181c2fe283416f07cce982 --- .gitignore | 2 +- .jshintignore | 2 ++ .jshintrc | 26 +++++++++++++++++++++++++- Gruntfile.js | 13 ++++++++++++- modules/jquery.qrcode.js | 14 +++++++------- package.json | 1 + 6 files changed, 48 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 4bf4869f..455433b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -.svn *~ *.kate-swp .*.swp node_modules/ +vendor/ diff --git a/.jshintignore b/.jshintignore index 08c5c45c..67acedba 100644 --- a/.jshintignore +++ b/.jshintignore @@ -1 +1,3 @@ modules/qrcode.js +node_modules/** +vendor/** diff --git a/.jshintrc b/.jshintrc index 0967ef42..e85b0112 100644 --- a/.jshintrc +++ b/.jshintrc @@ -1 +1,25 @@ -{} +{ + // Enforcing + "bitwise": true, + "eqeqeq": true, + "freeze": true, + "latedef": true, + "noarg": true, + "nonew": true, + "undef": true, + "unused": true, + "strict": false, + + // Relaxing + "es5": false, + + // Environment + "browser": true, + "jquery": true, + + "globals": { + "mediaWiki": false, + "QRCode": false, + "QRErrorCorrectLevel": false + } +} diff --git a/Gruntfile.js b/Gruntfile.js index 9c56558a..3c7f63a3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,9 +1,20 @@ /*jshint node:true */ module.exports = function ( grunt ) { + grunt.loadNpmTasks( 'grunt-contrib-jshint' ); grunt.loadNpmTasks( 'grunt-banana-checker' ); grunt.loadNpmTasks( 'grunt-jsonlint' ); grunt.initConfig( { + jshint: { + options: { + jshintrc: true + }, + all: [ + '**/*.js', + '!modules/qrcode.js', + '!node_modules/**' + ] + }, banana: { all: 'i18n/' }, @@ -15,6 +26,6 @@ module.exports = function ( grunt ) { } } ); - grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] ); + grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] ); grunt.registerTask( 'default', 'test' ); }; diff --git a/modules/jquery.qrcode.js b/modules/jquery.qrcode.js index 8e82e56e..6e07fcdb 100644 --- a/modules/jquery.qrcode.js +++ b/modules/jquery.qrcode.js @@ -1,7 +1,7 @@ -(function( $ ){ - $.fn.qrcode = function(options) { +( function ( $ ) { + $.fn.qrcode = function ( options ) { // if options is string, - if( typeof options === 'string' ){ + if ( typeof options === 'string' ){ options = { text: options }; } @@ -81,8 +81,8 @@ }; return this.each(function(){ - var element = options.render == "canvas" ? createCanvas() : createTable(); - jQuery(element).appendTo(this); - }); + var element = options.render === "canvas" ? createCanvas() : createTable(); + $(element).appendTo(this); + } ); }; -})( jQuery ); +}( jQuery ) ); diff --git a/package.json b/package.json index 72eb4aa7..ba022f14 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "devDependencies": { "grunt": "0.4.5", "grunt-cli": "0.1.13", + "grunt-contrib-jshint": "0.12.0", "grunt-banana-checker": "0.4.0", "grunt-jsonlint": "1.0.7" }