Skip to content

Commit 630aad1

Browse files
committed
Merge pull request #82 from PolymerLabs/remove-scrim-tap-debouncer
remove scrim tap debouncer
2 parents 0ed5b02 + ba95f43 commit 630aad1

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

app-drawer/app-drawer.html

+2-10
Original file line numberDiff line numberDiff line change
@@ -311,14 +311,9 @@
311311
},
312312

313313
_scrimTapHandler: function() {
314-
if (this.persistent) {
315-
return;
316-
}
317-
318-
// This debouncer is needed because of Polymer/polymer#3405.
319-
this.debounce('_scrimTapHandler', function() {
314+
if (!this.persistent) {
320315
this.opened = false;
321-
}, 1);
316+
}
322317
},
323318

324319
_track: function(event) {
@@ -364,9 +359,6 @@
364359
},
365360

366361
_trackEnd: function(event) {
367-
// Track handler takes precedence over scrim tap handler. See Polymer/polymer#3405.
368-
this.cancelDebouncer('_scrimTapHandler');
369-
370362
// Calculate the velocity.
371363
this._velocity = this._calculateVelocity(event);
372364

app-drawer/test/app-drawer.html

-12
Original file line numberDiff line numberDiff line change
@@ -183,18 +183,6 @@
183183
assert.isTrue(ev.defaultPrevented);
184184
});
185185

186-
test('track events block scrim tap', function(done) {
187-
drawer.opened = true;
188-
drawer.fire('track', { state: 'start' });
189-
drawer.fire('tap', null /* detail */, { node: scrim });
190-
drawer.fire('track', { state: 'end', dx: 0, ddx: 0 });
191-
192-
window.setTimeout(function() {
193-
assert.isTrue(drawer.opened);
194-
done();
195-
}, 1);
196-
});
197-
198186
test('styles reset after swiping', function() {
199187
drawer.fire('track', { state: 'start' });
200188

0 commit comments

Comments
 (0)