jenkins-bot has submitted this change and it was merged.
Change subject: Add grunt-contrib-jshint to npm
......................................................................
Add grunt-contrib-jshint to npm
Change-Id: I463e92dc78d558cab7f537117cb06fa385ab09ea
---
A .jshintrc
M Gruntfile.js
M package.json
M resources/ext.cirrus.suggest.js
4 files changed, 40 insertions(+), 3 deletions(-)
Approvals:
Hashar: Looks good to me, approved
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..8a2a10c
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,23 @@
+{
+ // 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
+ }
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index aefb191..29c1a60 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -6,11 +6,24 @@
/*jshint node:true */
module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
+
grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: [
+ '**/*.js',
+ '!node_modules/**'
+ ]
+ },
banana: {
- all: ['i18n/']
+ all: [
+ 'i18n/'
+ ]
},
jsonlint: {
all: [
@@ -20,6 +33,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index 148a79d..6f85da3 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-banana-checker": "0.4.0",
+ "grunt-contrib-jshint": "0.12.0",
"grunt-jsonlint": "1.0.7"
}
}
diff --git a/resources/ext.cirrus.suggest.js b/resources/ext.cirrus.suggest.js
index 2096ef3..ce766a5 100644
--- a/resources/ext.cirrus.suggest.js
+++ b/resources/ext.cirrus.suggest.js
@@ -1,5 +1,5 @@
( function ( $, mw ) {
- $( function() {
+ $( function () {
// Override default opensearch
mw.searchSuggest.type = 'cirrus-suggest';
mw.searchSuggest.request = function ( api, query, response,
maxRows ) {
--
To view, visit https://gerrit.wikimedia.org/r/265232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I463e92dc78d558cab7f537117cb06fa385ab09ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
