Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit e853c3d

Browse files
committed
merging in master
2 parents 896e1a2 + 3cf419a commit e853c3d

File tree

132 files changed

+3132
-3343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+3132
-3343
lines changed

.eslintrc

Lines changed: 92 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,108 @@
11
{
22
"root": true,
33
"extends": "eslint:recommended",
4-
"parser": "babel-eslint",
4+
"parser": "esprima",
55
"parserOptions": {
66
"ecmaVersion": 6
77
},
88
"rules": {
9-
"quotes": 0,
10-
"curly": [1, "multi-line"],
9+
"accessor-pairs": 1,
10+
"array-callback-return": 2,
11+
"block-scoped-var": 1,
12+
"brace-style": 1,
13+
"curly": [2, "multi-line"],
1114
"camelcase": 0,
1215
"comma-dangle": 0,
16+
"comma-spacing": [2, { "before": false, "after": true }],
17+
"comma-style": [2, "last"],
18+
"consistent-this": [2, "self"],
19+
"dot-location": [2, "property"],
1320
"dot-notation": 0,
21+
"eqeqeq": 0,
22+
"indent": [1, 2, { "VariableDeclarator": { "var": 2, "let": 2, "const": 3 } }],
23+
"guard-for-in": 2,
24+
"key-spacing": [1, {
25+
"singleLine": {
26+
"beforeColon": false,
27+
"afterColon": true
28+
},
29+
"multiLine": {
30+
"beforeColon": false,
31+
"afterColon": true,
32+
"mode": "minimum"
33+
}}],
34+
"keyword-spacing": 1,
35+
"no-caller": 2,
36+
"no-cond-assign": 2,
1437
"no-console": 0,
15-
"no-use-before-define": [1, "nofunc"],
38+
"no-control-regex": 2,
39+
"no-debugger": 2,
40+
"no-dupe-args": 2,
41+
"no-dupe-keys": 2,
42+
"no-duplicate-case": 2,
43+
"no-else-return": 2,
44+
"no-empty": 2,
45+
"no-empty-character-class": 2,
46+
"no-empty-function": 2,
47+
"no-eq-null": 2,
48+
"no-eval": 2,
49+
"no-ex-assign": 2,
50+
"no-extend-native": 2,
51+
"no-extra-bind": 2,
52+
"no-extra-boolean-cast": 2,
53+
"no-extra-parens": [2, "all", {"nestedBinaryExpressions": false}],
54+
"no-extra-semi": 2,
55+
"no-fallthrough": 2,
56+
"no-floating-decimal": 2,
57+
"no-func-assign": 2,
58+
"no-implicit-globals": 2,
59+
"no-implied-eval": 2,
60+
"no-invalid-regexp": 2,
61+
"no-irregular-whitespace": 2,
62+
"no-iterator": 2,
63+
"no-label-var": 2,
64+
"no-loop-func": 2,
65+
"no-lone-blocks": 2,
66+
"no-mixed-spaces-and-tabs": 2,
67+
"no-multi-spaces": 1,
68+
"no-multi-str": 2,
69+
"no-multiple-empty-lines": [1, {"max": 2}],
70+
"no-native-reassign": 2,
71+
"no-negated-in-lhs": 2,
72+
//"no-new": 2,
73+
"no-new-func": 2,
74+
"no-new-wrappers": 2,
75+
"no-obj-calls": 2,
76+
"no-octal": 2,
77+
"no-octal-escape": 2,
78+
"no-proto": 2,
79+
"no-redeclare": 2,
80+
"no-regex-spaces": 2,
81+
"no-self-assign": 2,
82+
"no-self-compare": 2,
83+
"no-shadow-restricted-names": 2,
84+
"no-undef": 2,
85+
"no-undef-init": 2,
86+
"no-undefined": 1,
1687
"no-underscore-dangle": 0,
17-
"no-unused-vars": 0,
88+
"no-unexpected-multiline": 2,
89+
"no-unneeded-ternary": 2,
90+
"no-unreachable": 2,
91+
"no-unsafe-finally": 2,
92+
"no-unused-labels": 2,
93+
"no-unused-vars": [2, { "varsIgnorePattern": "cropit|chosen|mCustomScrollbar|mouseWheel|colpicker" }],
94+
"no-use-before-define": [2, "nofunc"],
95+
"no-useless-concat": 2,
96+
"no-useless-escape": 2,
97+
"no-with": 2,
1898
"new-cap": 0,
19-
"semi": [1, "always"]
99+
//"quotes": ["error", "single", {"avoidEscape": true, "allowTemplateLiterals": true}],
100+
"semi": [1, "always"],
101+
"strict": 2,
102+
"use-isnan": 2,
103+
"valid-jsdoc": 2,
104+
"valid-typeof": 2,
105+
"yoda": 2
20106
},
21107
"env": {
22108
"browser": true,

.jshintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

.jshintrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"node": true,
3+
4+
"curly": true,
5+
"latedef": true,
6+
"quotmark": true,
7+
"undef": true,
8+
"unused": true,
9+
"trailing": true
10+
}

0 commit comments

Comments
 (0)