Skip to content

Commit 4fac820

Browse files
authored
Merge branch 'master' into develop
2 parents b3c2209 + 7472283 commit 4fac820

25 files changed

+5877
-602
lines changed

.circleci/config.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Javascript Node CircleCI 2.0 configuration file
2+
#
3+
# Check https://circleci.com/docs/2.0/language-javascript/ for more details
4+
#
5+
version: 2
6+
jobs:
7+
build:
8+
docker:
9+
# specify the version you desire here
10+
- image: circleci/node:8
11+
12+
# Specify service dependencies here if necessary
13+
# CircleCI maintains a library of pre-built images
14+
# documented at https://circleci.com/docs/2.0/circleci-images/
15+
# - image: circleci/mongo:3.4.4
16+
17+
working_directory: ~/repo
18+
19+
steps:
20+
- checkout
21+
22+
- run:
23+
name: "Checking Versions"
24+
command: |
25+
node --version
26+
npm --version
27+
28+
- run:
29+
name: update-npm
30+
command: 'sudo npm install -g npm@latest'
31+
32+
# Download and cache dependencies
33+
- restore_cache:
34+
key: dependency-cache-{{ checksum "package.json" }}
35+
36+
- run: npm install
37+
38+
- save_cache:
39+
key: dependency-cache-{{ checksum "package.json" }}
40+
paths:
41+
- ./node_modules
42+
43+
- run:
44+
name: "Checking Versions"
45+
command: |
46+
node --version
47+
npm --version
48+
49+
# run tests!
50+
- run: grunt test

.eslintrc.js

Lines changed: 37 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = {
2424
"warn",
2525
"always"
2626
],
27-
"brace-style": [
27+
"brace-style": [
2828
"error",
2929
"1tbs"
3030
],
@@ -33,7 +33,6 @@ module.exports = {
3333
"warn",
3434
{ "properties": "always" }
3535
],
36-
"capitalized-comments": "off",
3736
"class-methods-use-this": "error",
3837
"comma-dangle": [
3938
"error",
@@ -47,8 +46,16 @@ module.exports = {
4746
],
4847
"computed-property-spacing": "error",
4948
"consistent-return": "error",
50-
"consistent-this": "error",
51-
"curly": "error",
49+
"consistent-this": [
50+
"error",
51+
"that",
52+
"outerThis",
53+
"self"
54+
],
55+
"curly": [
56+
"error",
57+
"all"
58+
],
5259
"default-case": "error",
5360
"dot-location": [
5461
"error",
@@ -59,24 +66,14 @@ module.exports = {
5966
"eqeqeq": "error",
6067
"func-call-spacing": "error",
6168
"func-name-matching": "error",
62-
"func-names": "off",
63-
"func-style": "off",
64-
"generator-star-spacing": "error",
65-
"global-require": "error",
66-
"guard-for-in": "warn",
67-
"handle-callback-err": "error",
68-
"id-blacklist": "error",
6969
"id-length": [
7070
"warn",
7171
{ "exceptions": ["$","e","i","j"] }
7272
],
73-
"id-match": "error",
7473
"indent": [
7574
"error",
7675
"tab"
7776
],
78-
"init-declarations": "off",
79-
"jsx-quotes": "error",
8077
"key-spacing": [
8178
"warn", {
8279
"singleLine": {
@@ -91,16 +88,11 @@ module.exports = {
9188
}
9289
],
9390
"keyword-spacing": "error",
94-
"line-comment-position": "off",
9591
"linebreak-style": [
9692
"warn",
9793
"unix"
9894
],
99-
"lines-around-comment": "off",
100-
"lines-around-directive": "off",
10195
"max-depth": "warn",
102-
"max-len": "off",
103-
"max-lines": "off",
10496
"max-nested-callbacks": "error",
10597
"max-params": [
10698
"warn",
@@ -119,8 +111,6 @@ module.exports = {
119111
"never"
120112
],
121113
"new-parens": "error",
122-
"newline-after-var": "warn",
123-
"newline-before-return": "error",
124114
"newline-per-chained-call": [
125115
"warn",
126116
{ "ignoreChainWithDepth": 3 }
@@ -130,13 +120,15 @@ module.exports = {
130120
"no-await-in-loop": "error",
131121
"no-bitwise": "error",
132122
"no-caller": "error",
133-
"no-catch-shadow": "warn",
134123
"no-compare-neg-zero": "error",
135124
"no-confusing-arrow": "error",
136125
"no-continue": "warn",
137126
"no-div-regex": "error",
138127
"no-duplicate-imports": "error",
139-
"no-else-return": "error",
128+
"no-else-return": [
129+
"error",
130+
{ "allowElseIf": false }
131+
],
140132
"no-empty": [
141133
"error",
142134
{ "allowEmptyCatch": true }
@@ -165,12 +157,11 @@ module.exports = {
165157
"no-global-assign": "error",
166158
"no-implicit-globals": "error",
167159
"no-implied-eval": "error",
168-
"no-inline-comments": "off",
169160
"no-inner-declarations": [
170161
"warn",
171162
"both"
172163
],
173-
"no-invalid-this": "off",
164+
"no-invalid-this": "warn",
174165
"no-iterator": "error",
175166
"no-label-var": "error",
176167
"no-labels": "error",
@@ -205,9 +196,7 @@ module.exports = {
205196
"no-new-require": "error",
206197
"no-new-wrappers": "error",
207198
"no-octal-escape": "error",
208-
"no-param-reassign": "off",
209199
"no-path-concat": "error",
210-
"no-plusplus": "off",
211200
"no-process-env": "error",
212201
"no-process-exit": "error",
213202
"no-proto": "error",
@@ -224,9 +213,7 @@ module.exports = {
224213
"no-sequences": "error",
225214
"no-shadow": "warn",
226215
"no-shadow-restricted-names": "error",
227-
"no-spaced-func": "error",
228216
"no-sync": "warn",
229-
"no-tabs": "off",
230217
"no-template-curly-in-string": "error",
231218
"no-ternary": "warn",
232219
"no-throw-literal": "warn",
@@ -258,7 +245,7 @@ module.exports = {
258245
"no-useless-escape": "error",
259246
"no-useless-rename": "error",
260247
"no-useless-return": "error",
261-
"no-var": "off",
248+
"no-var": "warn",
262249
"no-void": "error",
263250
"no-warning-comments": "warn",
264251
"no-whitespace-before-property": "error",
@@ -283,22 +270,21 @@ module.exports = {
283270
"warn",
284271
"consistent"
285272
],
286-
"one-var": "off",
287-
"one-var-declaration-per-line": "off",
288273
"operator-assignment": [
289274
"error",
290275
"always"
291276
],
292277
"operator-linebreak": "error",
293-
"padded-blocks": "off",
294-
"prefer-arrow-callback": "off",
278+
"padding-line-between-statements": [
279+
"warn",
280+
{ "blankLine": "always", "prev": ["const", "let", "var"], "next": "*"},
281+
{ "blankLine": "any", "prev": ["const", "let", "var"], "next": ["const", "let", "var"]},
282+
{ "blankLine": "always", "prev": "directive", "next": "*" },
283+
{ "blankLine": "any", "prev": "directive", "next": "directive" },
284+
{ "blankLine": "always", "prev": "*", "next": "return" }
285+
],
295286
"prefer-const": "error",
296-
"prefer-destructuring": "off",
297-
"prefer-numeric-literals": "off",
298287
"prefer-promise-reject-errors": "error",
299-
"prefer-rest-params": "off",
300-
"prefer-spread": "off",
301-
"prefer-template": "off",
302288
"quote-props": [
303289
"warn",
304290
"consistent-as-needed"
@@ -313,15 +299,24 @@ module.exports = {
313299
],
314300
"radix": "error",
315301
"require-await": "error",
316-
"require-jsdoc": "off",
317302
"rest-spread-spacing": "error",
318-
"semi": "error",
303+
"semi": [
304+
"error",
305+
"always"
306+
],
319307
"semi-spacing": "error",
320308
"sort-imports": "error",
321309
"sort-keys": "warn",
322310
"sort-vars": "warn",
323311
"space-before-blocks": "warn",
324-
"space-before-function-paren": "off",
312+
"space-before-function-paren": [
313+
"warn",
314+
{
315+
"anonymous": "ignore",
316+
"named": "never",
317+
"asyncArrow": "ignore"
318+
}
319+
],
325320
"space-in-parens": "warn",
326321
"space-infix-ops": "error",
327322
"space-unary-ops": "error",
@@ -340,14 +335,11 @@ module.exports = {
340335
"warn",
341336
"function"
342337
],
343-
"symbol-description": "off",
344338
"template-curly-spacing": "error",
345339
"template-tag-spacing": "error",
346340
"unicode-bom": "error",
347-
"valid-jsdoc": "warn",
348341
"vars-on-top": "warn",
349342
"wrap-iife": "error",
350-
"wrap-regex": "off",
351343
"yield-star-spacing": "error",
352344
"yoda": "error"
353345
}

.github/issue_template.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Please review [Instructions for Reporting a Bug](https://github.com/jquery-form/form/blob/master/CONTRIBUTING.md#reporting-a-bug).
2+
3+
### Description:
4+
5+
### Expected Behavior:
6+
7+
### Actual behavior:
8+
9+
### Versions:
10+
**LoadJSON:**
11+
**jQuery:**
12+
**Browsers:**
13+
14+
### Demonstration
15+
Link to demonstration of issue in [JSFiddle](https://jsfiddle.net/) or [CodePen](https://codepen.io/):
16+
17+
### Steps to reproduce:

0 commit comments

Comments
 (0)