quasar 2.4.4 → 2.4.8

package/src/components/scroll-observer/QScrollObserver.js

@@ -47,7 +47,7 @@ export default createComponent({
       }
     }
 
-    let timer = null, localScrollTarget, parentEl
+    let clearTimer = null, localScrollTarget, parentEl
 
     watch(() => props.scrollTarget, () => {
       unconfigureScrollTarget()
@@ -55,9 +55,7 @@ export default createComponent({
     })
 
     function emitEvent () {
-      clearTimeout(timer)
-      cancelAnimationFrame(timer)
-      timer = null
+      clearTimer !== null && clearTimer()
 
       const top = Math.max(0, getVerticalScrollPosition(localScrollTarget))
       const left = getHorizontalScrollPosition(localScrollTarget)
@@ -107,10 +105,15 @@ export default createComponent({
       if (immediately === true || props.debounce === 0 || props.debounce === '0') {
         emitEvent()
       }
-      else if (timer === null) {
-        timer = props.debounce
-          ? setTimeout(emitEvent, props.debounce)
-          : requestAnimationFrame(emitEvent)
+      else if (clearTimer === null) {
+        const [ timer, fn ] = props.debounce
+          ? [ setTimeout(emitEvent, props.debounce), clearTimeout ]
+          : [ requestAnimationFrame(emitEvent), cancelAnimationFrame ]
+
+        clearTimer = () => {
+          fn(timer)
+          clearTimer = null
+        }
       }
     }
 
@@ -122,8 +125,7 @@ export default createComponent({
     })
 
     onBeforeUnmount(() => {
-      clearTimeout(timer)
-      cancelAnimationFrame(timer)
+      clearTimer !== null && clearTimer()
       unconfigureScrollTarget()
     })
 

package/src/css/core/visibility.sass

@@ -160,4 +160,3 @@ body.desktop
   .q-focusable:focus, .q-manual-focusable--focused
     > .q-focus-helper
       opacity: .22
-

package/src/plugins/LoadingBar.json

@@ -10,7 +10,7 @@
     "definition": {
       "...props": {
         "type": "Object",
-        "desc": "QAjaxBar component props",
+        "desc": "QAjaxBar component props, EXCEPT for 'hijack-filter'",
         "__exemption": [ "examples" ]
       }
     }

package/src/utils/private/global-dialog.js

@@ -147,14 +147,14 @@ export default function (DefaultComponent, supportsCustomComponent, parentApp) {
       applyState('show')
     }
 
-    if (dialogRef.value !== null) {
-      show()
-    }
-    else if (typeof DialogComponent.__asyncLoader === 'function') {
+    if (typeof DialogComponent.__asyncLoader === 'function') {
       DialogComponent.__asyncLoader().then(() => {
         nextTick(show)
       })
     }
+    else {
+      nextTick(show)
+    }
 
     return API
   }