Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .brackets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"jslint.options": {
"vars": true,
"plusplus": true,
"node": true,
"browser": false,
"devel": true,
"nomen": true,
"indent": 4,
"maxerr": 50,
"regexp": true,
"es5": true
},
"defaultExtension": "js",
"language": {
"javascript": {
"linting.prefer": ["ESLint", "JSLint"],
"linting.usePreferredOnly": true
}
},
"spaceUnits": 4,
"useTabChar": false
}
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Third party modules
**/thirdparty/**
46 changes: 46 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"env": {
"node": true
},
"rules": {
"no-bitwise": 2,
"curly": 2,
"eqeqeq": 2,
"guard-for-in": 2,
"wrap-iife": [2, "outside"],
"no-use-before-define": 2,
"new-cap": 2,
"no-caller": 2,
"no-empty": 2,
"no-new": 2,
"no-invalid-regexp": 2,
"no-control-regex": 2,
"no-regex-spaces": 2,
"no-undef": 2,
"strict": 2,
"no-unused-vars": [2, {"vars": "all", "args": "none"}],
"semi": 2,

"no-iterator": 2,
"no-loop-func": 2,
"no-multi-str": 2,
"no-fallthrough": 2,
"no-proto": 2,
"no-script-url": 2,
"no-shadow": 0,
"no-shadow-restricted-names": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-new-require": 2,
"new-parens": 2,
"no-new-object": 2,
"no-invalid-this": 2,
"indent": [2, 4],

"valid-jsdoc": 0,
"valid-typeof": 2,

"no-trailing-spaces": [2, { "skipBlankLines": true }],
"eol-last": 2
}
}
75 changes: 0 additions & 75 deletions .jshintrc

This file was deleted.

20 changes: 11 additions & 9 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@
* DEALINGS IN THE SOFTWARE.
*
*/
/*jslint regexp:true*/
/*global module, require, process*/
module.exports = function (grunt) {
"use strict";

"use strict";

module.exports = function (grunt) {
var common = require("./tasks/common")(grunt),
resolve = common.resolve,
platform = common.platform(),
staging;

Expand Down Expand Up @@ -205,10 +203,14 @@ module.exports = function (grunt) {
"dest" : "deps/cef"
}
},
"jshint": {
"all" : ["Gruntfile.js", "tasks/**/*.js"],
"eslint": {
"all" : [
"Gruntfile.js",
"tasks/**/*.js",
"appshell/node-core/*.js"
],
"options": {
"jshintrc" : ".jshintrc"
"quiet" : true
}
},
"build": {
Expand Down Expand Up @@ -238,7 +240,7 @@ module.exports = function (grunt) {
});

grunt.loadTasks("tasks");
grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-eslint");
grunt.loadNpmTasks("grunt-contrib-copy");
grunt.loadNpmTasks("grunt-contrib-clean");
grunt.loadNpmTasks("grunt-curl");
Expand Down
3 changes: 0 additions & 3 deletions appshell/appshell_extensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
// Note: All file native file i/o functions are synchronous, but are exposed
// here as asynchronous calls.

/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
/*global define, native */

var appshell;
if (!appshell) {
appshell = {};
Expand Down
Loading