Skip to content

Commit 8e05716

Browse files
committed
fix: [windows] Firefox and Quasar 0.15.8 Drawer "close event" response Problem ... quasarframework#1836
1 parent 456f029 commit 8e05716

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

src/components/layout/QLayoutDrawer.js

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ export default {
313313
if (!this.belowBreakpoint) {
314314
return
315315
}
316+
316317
const
317318
width = this.size,
318319
position = between(evt.distance.x, 0, width)
@@ -323,17 +324,17 @@ export default {
323324
opened = position >= Math.min(75, width)
324325

325326
el.classList.remove('no-transition')
326-
this.layout.__animate()
327-
this.$nextTick(() => {
328-
if (opened) {
329-
this.show()
330-
}
331-
else {
332-
this.applyBackdrop(0)
333-
this.applyPosition(this.stateDirection * width)
334-
el.classList.remove('q-layout-drawer-delimiter')
335-
}
336-
})
327+
328+
if (opened) {
329+
this.show()
330+
}
331+
else {
332+
this.layout.__animate()
333+
this.applyBackdrop(0)
334+
this.applyPosition(this.stateDirection * width)
335+
el.classList.remove('q-layout-drawer-delimiter')
336+
}
337+
337338
return
338339
}
339340

@@ -367,16 +368,16 @@ export default {
367368
if (evt.isFinal) {
368369
const opened = Math.abs(position) < Math.min(75, width)
369370
this.$refs.content.classList.remove('no-transition')
370-
this.layout.__animate()
371-
this.$nextTick(() => {
372-
if (opened) {
373-
this.applyBackdrop(1)
374-
this.applyPosition(0)
375-
}
376-
else {
377-
this.hide()
378-
}
379-
})
371+
372+
if (opened) {
373+
this.layout.__animate()
374+
this.applyBackdrop(1)
375+
this.applyPosition(0)
376+
}
377+
else {
378+
this.hide()
379+
}
380+
380381
return
381382
}
382383

@@ -416,7 +417,6 @@ export default {
416417
},
417418
__hide () {
418419
this.layout.__animate()
419-
clearTimeout(this.timer)
420420

421421
if (this.mobileOpened) {
422422
this.__preventScroll(false)
@@ -428,6 +428,7 @@ export default {
428428

429429
document.body.classList.remove(bodyClass)
430430

431+
clearTimeout(this.timer)
431432
this.timer = setTimeout(() => {
432433
this.hidePromise && this.hidePromiseResolve()
433434
}, duration)

0 commit comments

Comments
 (0)