Skip to content

Commit

Permalink
.eslintrc: update configs
Browse files Browse the repository at this point in the history
  • Loading branch information
taye committed Mar 22, 2018
1 parent f4a7fe5 commit e8808d7
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 16 deletions.
9 changes: 1 addition & 8 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
parserOptions:
parser: babel-eslint
sourceType: module
ecmaVersion: 6
ecmaVersion: 2017
ecmaFeatures:
experimentalObjectRestSpread: true

Expand Down Expand Up @@ -44,10 +44,3 @@ rules:
require-path-exists/notEmpty: 2
semi: [2, always]
space-before-function-paren: [2, always]

no-restricted-syntax:
- error
- default-params
- generators
- rest-params
- spread
13 changes: 9 additions & 4 deletions src/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ env:
browser: true
node: false

parserOptions:
ecmaFeatures:
experimentalObjectRestSpread: false

rules:
no-console: 2
strict: [2, never]

no-restricted-syntax:
- error
- selector: :matches(ArrowFunctionExpression,FunctionExpression,FunctionDeclaration) > AssignmentPattern
message: Using default parameters is not allowed.
- Generator
- RestElement
- ExperimentalRestProperty
- ExperimentalSpreadProperty
2 changes: 1 addition & 1 deletion src/Interaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ class Interaction {
return this.pointers[this.getPointerIndex(pointer)];
}

updatePointer (pointer, event, eventTarget, down = event && /(down|start)$/i.test(event.type)) {
updatePointer (pointer, event, eventTarget, down) {
const id = utils.pointer.getPointerId(pointer);
let pointerIndex = this.getPointerIndex(pointer);
let pointerInfo = this.pointers[pointerIndex];
Expand Down
6 changes: 3 additions & 3 deletions tests/pointerEvents/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@ test('pointerEvents Interaction update-pointer-down signal', t => {

const interaction = scope.interactions.new({});
const initialTimer = { duration: Infinity, timeout: null };
const event = { type: 'down' };
const event = {};

interaction.updatePointer(helpers.newPointer(0), event);
interaction.updatePointer(helpers.newPointer(0), event, null, true);
t.deepEqual(interaction.holdTimers, [initialTimer]);

interaction.updatePointer(helpers.newPointer(5), event);
interaction.updatePointer(helpers.newPointer(5), event, null, true);
t.deepEqual(interaction.holdTimers, [initialTimer, initialTimer]);

t.end();
Expand Down

0 comments on commit e8808d7

Please sign in to comment.