This commit is contained in:
Chris Rebert 2015-02-22 16:01:29 -08:00
Родитель 05f296c4dc
Коммит a393211565
3 изменённых файлов: 7 добавлений и 6 удалений

Просмотреть файл

@ -29,6 +29,7 @@
"no-self-compare": 2, "no-self-compare": 2,
"no-space-before-semi": 2, "no-space-before-semi": 2,
"no-spaced-func": 2, "no-spaced-func": 2,
"no-throw-literal": 2,
"no-trailing-spaces": 2, "no-trailing-spaces": 2,
"no-underscore-dangle": 0, "no-underscore-dangle": 0,
"no-void": 2, "no-void": 2,
@ -37,9 +38,9 @@
"quotes": 0, "quotes": 0,
"radix": 2, "radix": 2,
"semi": [2, "always"], "semi": [2, "always"],
"space-after-function-name": [2, "never"],
"space-after-keywords": [2, "always", {"checkFunctionKeyword": true}], "space-after-keywords": [2, "always", {"checkFunctionKeyword": true}],
"space-before-blocks": [2, "always"], "space-before-blocks": [2, "always"],
"space-before-function-parentheses": [2, {"anonymous": "always", "named": "never"}],
"space-in-brackets": [2, "never"], "space-in-brackets": [2, "never"],
"space-in-parens": [2, "never"], "space-in-parens": [2, "never"],
"space-return-throw-case": 2, "space-return-throw-case": 2,

Просмотреть файл

@ -42,7 +42,7 @@
"grunt-contrib-nodeunit": "^0.4.1", "grunt-contrib-nodeunit": "^0.4.1",
"grunt-contrib-qunit": "^0.5.2", "grunt-contrib-qunit": "^0.5.2",
"grunt-contrib-watch": "^0.6.1", "grunt-contrib-watch": "^0.6.1",
"grunt-eslint": "^6.0.0", "grunt-eslint": "^7.0.0",
"grunt-exec": "^0.4.6", "grunt-exec": "^0.4.6",
"grunt-jscs": "^1.5.0", "grunt-jscs": "^1.5.0",
"jquery": "~2.1.3", "jquery": "~2.1.3",

8
test-infra/npm-shrinkwrap.json сгенерированный
Просмотреть файл

@ -2621,12 +2621,12 @@
} }
}, },
"grunt-eslint": { "grunt-eslint": {
"version": "6.0.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-6.0.0.tgz", "resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-7.0.0.tgz",
"dependencies": { "dependencies": {
"eslint": { "eslint": {
"version": "0.14.1", "version": "0.15.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-0.14.1.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-0.15.0.tgz",
"dependencies": { "dependencies": {
"concat-stream": { "concat-stream": {
"version": "1.4.7", "version": "1.4.7",