Skip to content
This repository has been archived by the owner on Oct 29, 2019. It is now read-only.

Commit

Permalink
Merge pull request #405 from vxsx/feature/eslint
Browse files Browse the repository at this point in the history
replace jshint + jscs with eslint to follow cms
  • Loading branch information
vxsx committed May 26, 2016
2 parents 650f755 + 46ceb6b commit 7092ad8
Show file tree
Hide file tree
Showing 13 changed files with 263 additions and 133 deletions.
206 changes: 206 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
module.exports = {
"env": {
"browser": true,
"node": true,
"jquery": true,
"jasmine": true
},
"globals": {
"CMS": true
},
"root": true,
"ecmaFeatures": {
"modules": true
},
"rules": {
// Possible Errors
"comma-dangle": [2, "never"],
"no-cond-assign": 2,
"no-console": 1,
"no-constant-condition": 2,
"no-control-regex": 2,
"no-debugger": 2,
"no-dupe-args": 2,
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-empty-character-class": 2,
"no-empty": ["error", { "allowEmptyCatch": true }],
"no-ex-assign": 2,
"no-extra-boolean-cast": 2,
"no-extra-parens": ["error", "all", {
"nestedBinaryExpressions": false
}],
"no-extra-semi": 2,
"no-func-assign": 2,
"no-inner-declarations": 2,
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-negated-in-lhs": 2,
"no-obj-calls": 2,
"no-regex-spaces": 2,
"no-sparse-arrays": 2,
"no-unexpected-multiline": 2,
"no-unreachable": 2,
"use-isnan": 2,
"valid-jsdoc": [2, {
"requireReturn": false,
"requireParamDescription": false,
"requireReturnDescription": false,
"prefer": {
"return": "returns"
}
}],
"valid-typeof": 2,

// Best Practices
"accessor-pairs": 2,
"block-scoped-var": 2,
"complexity": ["error", { "max": 10 } ],
"consistent-return": 0,
"curly": 2,
"default-case": 2,
"dot-location": [2, "property"],
"dot-notation": 2,
"eqeqeq": 2,
"guard-for-in": 2,
"no-alert": 2,
"no-caller": 2,
"no-case-declarations": 2,
"no-div-regex": 2,
"no-else-return": 1,
"no-empty-pattern": 2,
"no-eq-null": 2,
"no-eval": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-fallthrough": 2,
"no-floating-decimal": 2,
"no-implicit-coercion": 0,
"no-implied-eval": 2,
"no-invalid-this": 0,
"no-iterator": 2,
"no-labels": 2,
"no-lone-blocks": 2,
"no-loop-func": 2,
"no-magic-numbers": ["error", { "ignore": [0, -1, 1, 2], "ignoreArrayIndexes": true }],
"no-multi-spaces": 2,
"no-multi-str": 0,
"no-native-reassign": 2,
"no-new-func": 2,
"no-new-wrappers": 2,
"no-new": 0,
"no-octal-escape": 2,
"no-octal": 2,
"no-param-reassign": 2,
"no-process-env": 0,
"no-proto": 2,
"no-redeclare": 2,
"no-return-assign": 2,
"no-script-url": 2,
"no-self-compare": 2,
"no-sequences": 2,
"no-throw-literal": 2,
"no-unused-expressions": [2, { "allowShortCircuit": true }],
"no-useless-call": 2,
"no-useless-concat": 2,
"no-void": 2,
"no-warning-comments": 0,
"no-with": 2,
"radix": 2,
"vars-on-top": 0, // FIXME should be enabled at some point
"wrap-iife": [2, "inside"],
"yoda": [2, "never", { "exceptRange": true }],

// Strict Mode
"strict": [2, "function"],

// Variables
"init-declarations": 0,
"no-catch-shadow": 2,
"no-delete-var": 2,
"no-label-var": 2,
"no-shadow-restricted-names": 2,
"no-shadow": 2,
"no-undef-init": 2,
"no-undef": 2,
"no-undefined": 0,
"no-unused-vars": 2,
"no-use-before-define": 2,

// Stylistic Issues
"array-bracket-spacing": [2, "never"],
"block-spacing": 2,
"brace-style": [2, "1tbs"],
"camelcase": 0,
"comma-spacing": [2, {"before": false, "after": true}],
"comma-style": [2, "last"],
"computed-property-spacing": [2, "never"],
"consistent-this": [2, "that"],
"eol-last": 2,
"func-names": 0,
"func-style": 0,
"id-length": 0,
"id-match": 0,
"indent": ["error", 4, {
"SwitchCase": 1
}],
"jsx-quotes": 0,
"key-spacing": [2, {"beforeColon": false, "afterColon": true}],
"linebreak-style": [2, "unix"],
"lines-around-comment": 0,
"max-nested-callbacks": [2, 5],
"new-cap": 2,
"new-parens": 2,
"newline-after-var": 2,
"no-array-constructor": 2,
"no-continue": 2,
"no-inline-comments": 0,
"no-lonely-if": 2,
"no-mixed-spaces-and-tabs": 2,
"no-multiple-empty-lines": [2, {"max": 2}],
"no-negated-condition": 2,
"no-nested-ternary": 2,
"no-new-object": 2,
"no-restricted-syntax": 0,
"no-spaced-func": 0,
"no-ternary": 0,
"no-trailing-spaces": 2,
"no-underscore-dangle": 0,
"no-unneeded-ternary": 2,
"object-curly-spacing": [2, "always", {
"objectsInObjects": true,
"arraysInObjects": true
}],
"one-var": [2, "never"],
"operator-assignment": 2,
"operator-linebreak": [2, "after"],
"padded-blocks": 0,
"quote-props": [2, "consistent-as-needed"],
"quotes": [2, "single", "avoid-escape"],
"require-jsdoc": 2,
"semi-spacing": [2, {"before": false, "after": true}],
"semi": [2, "always"],
"sort-vars": 0,
"keyword-spacing": 2,
"space-before-blocks": 2,
"space-before-function-paren": ["error", { "anonymous": "always", "named": "never" }],
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-unary-ops": 2,
"spaced-comment": [2, "always", {
exceptions: ["-", "+", "!"]
}],
"wrap-regex": 2,

// ES6
"arrow-parens": [2, "always"],

// Legacy
"max-depth": [2, 4],
"max-len": [2, 120],
"max-params": [2, 3],
"max-statements": 0,
"no-bitwise": 2,
"no-plusplus": 0
}
}
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ cms/django
!.coveragerc
!.codeclimate.yml
!.editorconfig
!.jshintrc
!.jscsrc
!.eslintrc.js
*.xml
/*env*/
*.sqlite
Expand Down Expand Up @@ -52,4 +51,4 @@ coverage-*.txt
docs/env
node_modules/
aldryn_newsblog/tests/frontend/coverage/
requirements.txt
requirements.txt
12 changes: 0 additions & 12 deletions .jscsrc

This file was deleted.

22 changes: 0 additions & 22 deletions .jshintrc

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@
* @copyright: http://www.divio.ch
*/

//######################################################################################################################
// #NAMESPACES#
var Cl = window.Cl || {};

//######################################################################################################################
// #UTILS#
(function ($) {
'use strict';

Expand All @@ -35,7 +31,7 @@ var Cl = window.Cl || {};
}).always(function (data) {
form.siblings('.js-search-results').html(data);
}).fail(function () {
alert('REQUEST TIMEOUT');
alert('REQUEST TIMEOUT'); // eslint-disable-line
});
},

Expand Down
30 changes: 30 additions & 0 deletions aldryn_newsblog/tests/frontend/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
module.exports = {
"env": {
"node": true
},
"globals": {
"$": true,
"module": true,
"process": true,
"it": true,
"CMS": true,
"expect": true,
"jasmine": true,
"describe": true,
"casper": true,
"beforeEach": true,
"afterEach": true,
"beforeAll": true,
"afterAll": true,
"spyOn": true,
"spyOnEvent": true,
"fixture": true,
"pending": true
},
"rules": {
"no-magic-numbers": 0,
"max-nested-callbacks": [2, 8],
"newline-after-var": 0,
"strict": [2, "global"]
}
};
6 changes: 0 additions & 6 deletions aldryn_newsblog/tests/frontend/.jshintrc

This file was deleted.

5 changes: 3 additions & 2 deletions aldryn_newsblog/tests/frontend/base.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ module.exports = {
return [
'Test', browserName, 'for',
process.env.TRAVIS_REPO_SLUG,
(process.env.TRAVIS_PULL_REQUEST !== 'false' ?
'pull request #' + process.env.TRAVIS_PULL_REQUEST : ''),
// eslint-disable-next-line no-negated-condition
process.env.TRAVIS_PULL_REQUEST !== 'false' ?
'pull request #' + process.env.TRAVIS_PULL_REQUEST : '',
'build #' + process.env.TRAVIS_JOB_NUMBER
].join(' ');
},
Expand Down
10 changes: 5 additions & 5 deletions aldryn_newsblog/tests/frontend/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ var baseConf = require('./base.conf');

module.exports = function (config) {
var browsers = {
'PhantomJS': 'used for local testing'
PhantomJS: 'used for local testing'
};

// Browsers to run on Sauce Labs
// Check out https://saucelabs.com/platforms for all browser/OS combos
if (process.env.SAUCE_USERNAME && process.env.SAUCE_ACCESS_KEY) {
browsers = baseConf.sauceLabsBrowsers.reduce(function (browsers, capability) {
browsers[JSON.stringify(capability)] = capability;
browsers[JSON.stringify(capability)].base = 'SauceLabs';
return browsers;
browsers = baseConf.sauceLabsBrowsers.reduce(function (newBrowsers, capability) {
newBrowsers[JSON.stringify(capability)] = capability;
newBrowsers[JSON.stringify(capability)].base = 'SauceLabs';
return newBrowsers;
}, {});
}

Expand Down

0 comments on commit 7092ad8

Please sign in to comment.