Skip to content

Commit ac2d787

Browse files
committed
Update prettier to 2.0
1 parent 08aeb62 commit ac2d787

7 files changed

+56
-55
lines changed

.prettierrc

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"arrowParens": "avoid",
23
"bracketSpacing": false,
34
"semi": true,
45
"singleQuote": true,

delegated-events.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const currentTargetDesc = Object.getOwnPropertyDescriptor(
1212

1313
function before(subject, verb, fn) {
1414
const source = subject[verb];
15-
subject[verb] = function() {
15+
subject[verb] = function () {
1616
fn.apply(subject, arguments);
1717
return source.apply(subject, arguments);
1818
};

package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"karma-chrome-launcher": "^3.1.0",
4141
"karma-mocha": "^1.3.0",
4242
"mocha": "^7.1.1",
43-
"prettier": "^1.19.1",
43+
"prettier": "^2.0.2",
4444
"rollup": "^1.32.1",
4545
"rollup-plugin-babel": "^4.4.0",
4646
"rollup-plugin-node-resolve": "^5.2.0",

test/bench.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {on, off} from '../delegated-events';
22

3-
(function() {
3+
(function () {
44
const DEPTH = 25;
55
const DISPATCHES = 1500;
66

@@ -36,12 +36,12 @@ import {on, off} from '../delegated-events';
3636
const handlers = new Map();
3737
return {
3838
name: 'native',
39-
on: function(selector) {
39+
on: function (selector) {
4040
const clone = matchHandler.bind(selector);
4141
handlers.set(selector, clone);
4242
document.addEventListener('test:bench', clone);
4343
},
44-
off: function(selector) {
44+
off: function (selector) {
4545
const handler = handlers.get(selector);
4646
handlers.delete(selector);
4747
document.removeEventListener('test:bench', handler);
@@ -52,10 +52,10 @@ import {on, off} from '../delegated-events';
5252
function delegated() {
5353
return {
5454
name: 'delegated',
55-
on: function(selector) {
55+
on: function (selector) {
5656
on('test:bench', selector, handler);
5757
},
58-
off: function(selector) {
58+
off: function (selector) {
5959
off('test:bench', selector, handler);
6060
}
6161
};
@@ -64,10 +64,10 @@ import {on, off} from '../delegated-events';
6464
function jquery() {
6565
return {
6666
name: 'jQuery',
67-
on: function(selector) {
67+
on: function (selector) {
6868
$(document).on('test:bench', selector, handler);
6969
},
70-
off: function(selector) {
70+
off: function (selector) {
7171
$(document).off('test:bench', selector, handler);
7272
}
7373
};
@@ -76,18 +76,18 @@ import {on, off} from '../delegated-events';
7676
function jqueryss() {
7777
return {
7878
name: 'jQuery + SelectorSet',
79-
setup: function() {
80-
return new Promise(function(resolve) {
79+
setup: function () {
80+
return new Promise(function (resolve) {
8181
const script = document.createElement('script');
8282
script.addEventListener('load', resolve);
8383
script.src = '../vendor/jquery-selector-set/jquery.selector-set.js';
8484
document.head.appendChild(script);
8585
});
8686
},
87-
on: function(selector) {
87+
on: function (selector) {
8888
$(document).on('test:bench', selector, handler);
8989
},
90-
off: function(selector) {
90+
off: function (selector) {
9191
$(document).off('test:bench', selector, handler);
9292
}
9393
};
@@ -96,10 +96,10 @@ import {on, off} from '../delegated-events';
9696
function zepto() {
9797
return {
9898
name: 'zepto',
99-
on: function(selector) {
99+
on: function (selector) {
100100
Zepto(document).on('test:bench', selector, handler);
101101
},
102-
off: function(selector) {
102+
off: function (selector) {
103103
Zepto(document).off('test:bench', selector, handler);
104104
}
105105
};
@@ -125,7 +125,7 @@ import {on, off} from '../delegated-events';
125125
const max = results.reduce((a, b) => (a.value > b.value ? a : b));
126126

127127
results = results
128-
.map(function(result, ix) {
128+
.map(function (result, ix) {
129129
const percent = (100 * result.value) / max.value;
130130
return {
131131
name: result.name,
@@ -138,7 +138,7 @@ import {on, off} from '../delegated-events';
138138

139139
const svg = document.querySelector('.js-results');
140140
const ns = 'http://www.w3.org/2000/svg';
141-
results.forEach(function(result, ix) {
141+
results.forEach(function (result, ix) {
142142
const row = document.createElementNS(ns, 'rect');
143143
row.setAttribute('fill', result.color);
144144
row.setAttribute('width', result.percent + '%');
@@ -170,12 +170,12 @@ import {on, off} from '../delegated-events';
170170
function run() {
171171
const selectors = build(DEPTH);
172172
const deepest = document.querySelector(selectors[selectors.length - 1]);
173-
const results = [native, delegated, jquery, zepto, jqueryss].map(function(
173+
const results = [native, delegated, jquery, zepto, jqueryss].map(function (
174174
test
175175
) {
176176
const harness = test();
177177
const ready = harness.setup ? harness.setup() : Promise.resolve();
178-
return ready.then(function() {
178+
return ready.then(function () {
179179
selectors.forEach(harness.on);
180180
const duration = benchmark(dispatch, deepest);
181181
selectors.forEach(harness.off);

test/test-flow.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function onButtonClick(event) {
1010
on('click', '.js-button', onButtonClick);
1111
off('click', 'js-button', onButtonClick);
1212

13-
on('robot:singularity', '.js-robot-image', function(event) {
13+
on('robot:singularity', '.js-robot-image', function (event) {
1414
event.target;
1515
event.target.closest('.foo');
1616
// event.detail.name

test/test.js

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {on, off, fire} from '../delegated-events';
22

3-
describe('delegated event listeners', function() {
4-
before(function() {
3+
describe('delegated event listeners', function () {
4+
before(function () {
55
const container = document.createElement('div');
66
container.innerHTML = `
77
<div class="js-test-parent">
@@ -10,9 +10,9 @@ describe('delegated event listeners', function() {
1010
document.body.appendChild(container);
1111
});
1212

13-
describe('custom event dispatch', function() {
14-
it('fires custom events with detail', function() {
15-
const observer = function(event) {
13+
describe('custom event dispatch', function () {
14+
it('fires custom events with detail', function () {
15+
const observer = function (event) {
1616
assert(event.bubbles);
1717
assert(event.cancelable);
1818
assert.equal(event.type, 'test:detail');
@@ -25,8 +25,8 @@ describe('delegated event listeners', function() {
2525
document.removeEventListener('test:detail', observer);
2626
});
2727

28-
it('fires custom events without detail', function() {
29-
const observer = function(event) {
28+
it('fires custom events without detail', function () {
29+
const observer = function (event) {
3030
assert(event.detail === undefined || event.detail === null);
3131
assert.instanceOf(event, CustomEvent);
3232
};
@@ -35,15 +35,15 @@ describe('delegated event listeners', function() {
3535
document.removeEventListener('test:fire', observer);
3636
});
3737

38-
it('returns canceled when default prevented', function() {
38+
it('returns canceled when default prevented', function () {
3939
const observer = event => event.preventDefault();
4040
document.addEventListener('test:cancel', observer);
4141
const canceled = !fire(document.body, 'test:cancel');
4242
assert.equal(canceled, true);
4343
document.removeEventListener('test:cancel', observer);
4444
});
4545

46-
it('returns not canceled when default is not prevented', function() {
46+
it('returns not canceled when default is not prevented', function () {
4747
const [observer, trace] = spy(event => assert.ok(event));
4848
document.addEventListener('test:event', observer);
4949
const canceled = !fire(document.body, 'test:event');
@@ -53,9 +53,9 @@ describe('delegated event listeners', function() {
5353
});
5454
});
5555

56-
describe('event observer registration', function() {
57-
it('observes custom events', function() {
58-
const observer = function(event) {
56+
describe('event observer registration', function () {
57+
it('observes custom events', function () {
58+
const observer = function (event) {
5959
assert(event.bubbles);
6060
assert(event.cancelable);
6161
assert.equal(event.type, 'test:on');
@@ -71,21 +71,21 @@ describe('delegated event listeners', function() {
7171
off('test:on', 'body', observer);
7272
});
7373

74-
it('removes bubble event observers', function() {
74+
it('removes bubble event observers', function () {
7575
const observer = event => assert.fail(event);
7676
on('test:off', '*', observer);
7777
off('test:off', '*', observer);
7878
fire(document.body, 'test:off');
7979
});
8080

81-
it('removes capture event observers', function() {
81+
it('removes capture event observers', function () {
8282
const observer = event => assert.fail(event);
8383
on('test:off', '*', observer, {capture: true});
8484
off('test:off', '*', observer, {capture: true});
8585
fire(document.body, 'test:off');
8686
});
8787

88-
it('can reregister after removing', function() {
88+
it('can reregister after removing', function () {
8989
const [observer, trace] = spy(event => assert.ok(event));
9090
on('test:register', 'body', observer);
9191
off('test:register', 'body', observer);
@@ -96,43 +96,43 @@ describe('delegated event listeners', function() {
9696
});
9797
});
9898

99-
describe('event propagation', function() {
100-
before(function() {
99+
describe('event propagation', function () {
100+
before(function () {
101101
this.parent = document.querySelector('.js-test-parent');
102102
this.child = document.querySelector('.js-test-child');
103103
});
104104

105-
it('fires observers in tree order', function() {
105+
it('fires observers in tree order', function () {
106106
const order = [];
107107

108108
const parent = this.parent;
109109
const child = this.child;
110110

111-
const one = function(event) {
111+
const one = function (event) {
112112
assert.strictEqual(child, event.target);
113113
assert.strictEqual(parent, event.currentTarget);
114114
assert.strictEqual(this, event.currentTarget);
115115
assert.strictEqual(this, parent);
116116
order.push(1);
117117
};
118118

119-
const two = function(event) {
119+
const two = function (event) {
120120
assert.strictEqual(child, event.target);
121121
assert.strictEqual(child, event.currentTarget);
122122
assert.strictEqual(this, event.currentTarget);
123123
assert.strictEqual(this, child);
124124
order.push(2);
125125
};
126126

127-
const three = function(event) {
127+
const three = function (event) {
128128
assert.strictEqual(child, event.target);
129129
assert.strictEqual(parent, event.currentTarget);
130130
assert.strictEqual(this, event.currentTarget);
131131
assert.strictEqual(this, parent);
132132
order.push(3);
133133
};
134134

135-
const four = function(event) {
135+
const four = function (event) {
136136
assert.strictEqual(child, event.target);
137137
assert.strictEqual(child, event.currentTarget);
138138
assert.strictEqual(this, event.currentTarget);
@@ -153,7 +153,7 @@ describe('delegated event listeners', function() {
153153
assert.deepEqual([1, 2, 4, 3], order);
154154
});
155155

156-
it('clears currentTarget after propagation', function() {
156+
it('clears currentTarget after propagation', function () {
157157
const [observer, trace] = spy(event => assert.ok(event.currentTarget));
158158
const event = new CustomEvent('test:clear', {bubbles: true});
159159

@@ -164,7 +164,7 @@ describe('delegated event listeners', function() {
164164
off('test:clear', 'body', observer);
165165
});
166166

167-
it('does not interfere with currentTarget when selectors match', function() {
167+
it('does not interfere with currentTarget when selectors match', function () {
168168
const [observer, trace] = spy(event =>
169169
assert.strictEqual(document.body, event.currentTarget)
170170
);
@@ -185,7 +185,7 @@ describe('delegated event listeners', function() {
185185
this.parent.removeEventListener('test:target:capture', observer2);
186186
});
187187

188-
it('does not interfere with currentTarget when no selectors match', function() {
188+
it('does not interfere with currentTarget when no selectors match', function () {
189189
const [observer, trace] = spy(event => assert.ok(event.currentTarget));
190190
const event = new CustomEvent('test:currentTarget', {bubbles: true});
191191

@@ -202,7 +202,7 @@ describe('delegated event listeners', function() {
202202
document.removeEventListener('test:currentTarget', observer);
203203
});
204204

205-
it('prevents redispatch after propagation is stopped', function() {
205+
it('prevents redispatch after propagation is stopped', function () {
206206
const [observer, trace] = spy(event => event.stopPropagation());
207207
const event = new CustomEvent('test:redispatch', {bubbles: true});
208208

@@ -217,7 +217,7 @@ describe('delegated event listeners', function() {
217217
off('test:redispatch', 'body', observer);
218218
});
219219

220-
it('stops propagation bubbling to parent', function() {
220+
it('stops propagation bubbling to parent', function () {
221221
const one = event => assert.fail(event);
222222
const two = event => event.stopPropagation();
223223
on('test:bubble', '.js-test-parent', one);
@@ -227,7 +227,7 @@ describe('delegated event listeners', function() {
227227
off('test:bubble', '.js-test-child', two);
228228
});
229229

230-
it('stops immediate propagation', function() {
230+
it('stops immediate propagation', function () {
231231
const one = event => event.stopImmediatePropagation();
232232
const two = event => assert.fail(event);
233233
on('test:immediate', '.js-test-child', one);
@@ -237,7 +237,7 @@ describe('delegated event listeners', function() {
237237
off('test:immediate', '.js-test-child', two);
238238
});
239239

240-
it('stops immediate propagation and bubbling', function() {
240+
it('stops immediate propagation and bubbling', function () {
241241
const one = event => assert.fail(event);
242242
const two = event => event.stopImmediatePropagation();
243243
on('test:stop', '.js-test-parent', one);
@@ -247,10 +247,10 @@ describe('delegated event listeners', function() {
247247
off('test:stop', '.js-test-child', two);
248248
});
249249

250-
it('calculates selector matches before dispatching event', function() {
250+
it('calculates selector matches before dispatching event', function () {
251251
this.child.classList.add('inactive');
252252

253-
const one = function(event) {
253+
const one = function (event) {
254254
event.target.classList.remove('inactive');
255255
event.target.classList.add('active');
256256
assert.ok(event);
@@ -270,7 +270,7 @@ describe('delegated event listeners', function() {
270270

271271
function spy(fn) {
272272
const tracker = {calls: 0};
273-
const capture = function() {
273+
const capture = function () {
274274
tracker.calls++;
275275
return fn.apply(this, arguments);
276276
};

0 commit comments

Comments
 (0)