Skip to content

Commit b31bdcf

Browse files
jlmakesjlmakes
committed
remove eslint style rules
Rely solely on prettier for formatting.
1 parent 8b31dd9 commit b31bdcf

34 files changed

Lines changed: 156 additions & 167 deletions

‎.eslintrc.json‎

Lines changed: 27 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,29 @@
11
{
2-
"env": {
3-
"es6": true,
4-
"amd": true,
5-
"browser": true,
6-
"mocha": true,
7-
"node": true
8-
},
9-
"extends": "eslint:recommended",
10-
"parserOptions": {
11-
"sourceType": "module"
12-
},
13-
"globals": {
14-
"describe": true,
15-
"it": true,
16-
"expect": true,
17-
"sinon": true
18-
},
19-
"rules": {
20-
"array-bracket-spacing": [2, "never", { "arraysInArrays": true }],
21-
"arrow-spacing": 2,
22-
"block-spacing": 2,
23-
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
24-
"comma-dangle": [2, "always-multiline"],
25-
"comma-spacing": [2, { "before": false, "after": true }],
26-
"eol-last": [2, "always"],
27-
"indent": [2, "tab", { "SwitchCase": 1 }],
28-
"key-spacing": 2,
29-
"keyword-spacing": 2,
30-
"no-cond-assign": 2,
31-
"no-console": 1,
32-
"no-const-assign": 2,
33-
"no-class-assign": 2,
34-
"no-this-before-super": 2,
35-
"no-trailing-spaces": 2,
36-
"no-unused-vars": 1,
37-
"no-var": 2,
38-
"no-mixed-spaces-and-tabs": [2, "smart-tabs"],
39-
"object-curly-spacing": [2, "always"],
40-
"object-shorthand": [2, "always"],
41-
"semi": [2, "never"],
42-
"space-before-blocks": [2, "always"],
43-
"space-before-function-paren": [2, "always"],
44-
"space-in-parens": [2, "never"],
45-
"quote-props": [2, "as-needed"],
46-
"quotes": [2, "single"]
47-
}
2+
"env": {
3+
"es6": true,
4+
"amd": true,
5+
"browser": true,
6+
"mocha": true,
7+
"node": true
8+
},
9+
"extends": "eslint:recommended",
10+
"parserOptions": {
11+
"sourceType": "module"
12+
},
13+
"globals": {
14+
"describe": true,
15+
"it": true,
16+
"expect": true,
17+
"sinon": true
18+
},
19+
"rules": {
20+
"no-cond-assign": 2,
21+
"no-console": 1,
22+
"no-const-assign": 2,
23+
"no-class-assign": 2,
24+
"no-this-before-super": 2,
25+
"no-unused-vars": 1,
26+
"no-var": 2,
27+
"object-shorthand": [2, "always"]
28+
}
4829
}

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
node_modules/
44
yarn.lock
55
package-lock.json
6-
.vscode/

‎bower.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"name": "scrollreveal",
3-
"description": "Easy scroll animations for web and mobile browsers.",
4-
"homepage": "https://scrollrevealjs.org",
5-
"main": ["dist/scrollreveal.js"],
6-
"repository": {
7-
"type": "git",
8-
"url": "https://github.com/jlmakes/scrollreveal.git"
9-
},
10-
"moduleType": ["amd", "node", "globals"],
11-
"ignore": [
12-
"**/.*",
13-
"lib",
14-
"src",
15-
"test",
16-
"gulpfile.js",
17-
"karma.conf.js",
18-
"package.json",
19-
"saucelabs-browsers.js"
20-
],
21-
"keywords": ["scroll", "reveal", "animate", "animation"],
22-
"authors": ["Julian Lloyd"],
23-
"license": "GPL-3.0"
2+
"name": "scrollreveal",
3+
"description": "Easy scroll animations for web and mobile browsers.",
4+
"homepage": "https://scrollrevealjs.org",
5+
"main": ["dist/scrollreveal.js"],
6+
"repository": {
7+
"type": "git",
8+
"url": "https://github.com/jlmakes/scrollreveal.git"
9+
},
10+
"moduleType": ["amd", "node", "globals"],
11+
"ignore": [
12+
"**/.*",
13+
"lib",
14+
"src",
15+
"test",
16+
"gulpfile.js",
17+
"karma.conf.js",
18+
"package.json",
19+
"saucelabs-browsers.js"
20+
],
21+
"keywords": ["scroll", "reveal", "animate", "animation"],
22+
"authors": ["Julian Lloyd"],
23+
"license": "GPL-3.0"
2424
}

‎build/rollup.conf.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ export default {
99
plugins: [json(), nodeResolve({ jsnext: true, main: true }), buble()],
1010
output: [
1111
{ format: 'umd', file: 'dist/scrollreveal.js', name: 'ScrollReveal' },
12-
{ format: 'es', file: 'dist/scrollreveal.es.js' },
13-
],
12+
{ format: 'es', file: 'dist/scrollreveal.es.js' }
13+
]
1414
}

‎build/rollup.conf.min.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ export default {
1414
buble(),
1515
strip({
1616
functions: ['logger'],
17-
sourceMaps: false,
17+
sourceMaps: false
1818
}),
1919
uglify({
2020
output: {
21-
comments: /@license ScrollReveal/,
22-
},
23-
}),
21+
comments: /@license ScrollReveal/
22+
}
23+
})
2424
],
2525
output: {
2626
format: 'iife',
2727
file: 'dist/scrollreveal.min.js',
28-
name: 'ScrollReveal',
29-
},
28+
name: 'ScrollReveal'
29+
}
3030
}

‎src/instance/constructor.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let _config
2222
let _debug
2323
let _instance
2424

25-
export default function ScrollReveal (options = {}) {
25+
export default function ScrollReveal(options = {}) {
2626
const invokedWithoutNew =
2727
typeof this === 'undefined' ||
2828
Object.getPrototypeOf(this) !== ScrollReveal.prototype
@@ -93,7 +93,7 @@ export default function ScrollReveal (options = {}) {
9393
containers: {},
9494
elements: {},
9595
history: [],
96-
sequences: {},
96+
sequences: {}
9797
}
9898

9999
this.pristine = true
@@ -120,5 +120,5 @@ Object.defineProperty(ScrollReveal, 'debug', {
120120
get: () => _debug || false,
121121
set: value => {
122122
if (typeof value === 'boolean') _debug = value
123-
},
123+
}
124124
})

‎src/instance/defaults.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default {
88
rotate: {
99
x: 0,
1010
y: 0,
11-
z: 0,
11+
z: 0
1212
},
1313
scale: 1,
1414
container: document.documentElement,
@@ -21,10 +21,10 @@ export default {
2121
top: 0,
2222
right: 0,
2323
bottom: 0,
24-
left: 0,
24+
left: 0
2525
},
26-
afterReset () {},
27-
afterReveal () {},
28-
beforeReset () {},
29-
beforeReveal () {},
26+
afterReset() {},
27+
afterReveal() {},
28+
beforeReset() {},
29+
beforeReveal() {}
3030
}

‎src/instance/functions/animate.js‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import clean from '../methods/clean'
22

3-
export default function animate (element, force = {}) {
3+
export default function animate(element, force = {}) {
44
const pristine = force.pristine || this.pristine
55
const delayed =
66
element.config.useDelay === 'always' ||
@@ -19,11 +19,11 @@ export default function animate (element, force = {}) {
1919
}
2020
}
2121

22-
function triggerReveal (element, delayed) {
22+
function triggerReveal(element, delayed) {
2323
const styles = [
2424
element.styles.inline.generated,
2525
element.styles.opacity.computed,
26-
element.styles.transform.generated.final,
26+
element.styles.transform.generated.final
2727
]
2828
if (delayed) {
2929
styles.push(element.styles.transition.generated.delayed)
@@ -35,19 +35,19 @@ function triggerReveal (element, delayed) {
3535
registerCallbacks.call(this, element, delayed)
3636
}
3737

38-
function triggerReset (element) {
38+
function triggerReset(element) {
3939
const styles = [
4040
element.styles.inline.generated,
4141
element.styles.opacity.generated,
4242
element.styles.transform.generated.initial,
43-
element.styles.transition.generated.instant,
43+
element.styles.transition.generated.instant
4444
]
4545
element.revealed = false
4646
element.node.setAttribute('style', styles.filter(s => s !== '').join(' '))
4747
registerCallbacks.call(this, element)
4848
}
4949

50-
function registerCallbacks (element, isDelayed) {
50+
function registerCallbacks(element, isDelayed) {
5151
const duration = isDelayed
5252
? element.config.duration + element.config.delay
5353
: element.config.duration
@@ -56,7 +56,9 @@ function registerCallbacks (element, isDelayed) {
5656
? element.config.beforeReveal
5757
: element.config.beforeReset
5858

59-
const afterCallback = element.revealed ? element.config.afterReveal : element.config.afterReset
59+
const afterCallback = element.revealed
60+
? element.config.afterReveal
61+
: element.config.afterReset
6062

6163
let elapsed = 0
6264
if (element.callbackTimer) {
@@ -74,6 +76,6 @@ function registerCallbacks (element, isDelayed) {
7476
if (element.revealed && !element.config.reset) {
7577
clean.call(this, element.node)
7678
}
77-
}, duration - elapsed),
79+
}, duration - elapsed)
7880
}
7981
}

‎src/instance/functions/delegate.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import getGeometry from '../../utils/get-geometry'
77
import getScrolled from '../../utils/get-scrolled'
88
import isElementVisible from '../../utils/is-element-visible'
99

10-
export default function delegate (
10+
export default function delegate(
1111
event = { type: 'init' },
1212
elements = this.store.elements
1313
) {
@@ -22,7 +22,7 @@ export default function delegate (
2222
if (container.scroll) {
2323
container.direction = {
2424
x: mathSign(scroll.left - container.scroll.left),
25-
y: mathSign(scroll.top - container.scroll.top),
25+
y: mathSign(scroll.top - container.scroll.top)
2626
}
2727
}
2828
container.scroll = scroll

‎src/instance/functions/initialize.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import each from '../../utils/each'
22
import rinse from './rinse'
33

4-
export default function initialize () {
4+
export default function initialize() {
55
rinse.call(this)
66

77
each(this.store.elements, element => {

0 commit comments

Comments
 (0)