quasar 2.4.7 → 2.4.8

package/dist/ssr-directives/Morph.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.4.7
+ * Quasar Framework v2.4.8
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */

package/dist/web-types/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "",
   "framework": "vue",
   "name": "quasar",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "contributions": {
     "html": {
       "types-syntax": "typescript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
   "main": "dist/quasar.cjs.prod.js",
   "module": "dist/quasar.esm.prod.js",

package/src/components/icon/QIcon.js

@@ -169,17 +169,13 @@ export default createComponent({
 
       if (type.value.img === true) {
         return h('div', data, hMergeSlot(slots.default, [
-          h('img', {
-            class: type.value.cls,
-            src: type.value.src
-          })
+          h('img', { src: type.value.src })
         ]))
       }
 
       if (type.value.svg === true) {
         return h('div', data, hMergeSlot(slots.default, [
           h('svg', {
-            class: type.value.cls,
             viewBox: type.value.viewBox
           }, type.value.nodes)
         ]))
@@ -188,7 +184,6 @@ export default createComponent({
       if (type.value.svguse === true) {
         return h('div', data, hMergeSlot(slots.default, [
           h('svg', {
-            class: type.value.cls,
             viewBox: type.value.viewBox
           }, [
             h('use', { 'xlink:href': type.value.src })

package/src/components/icon/QIcon.sass

@@ -19,7 +19,8 @@
     align-items: center
     justify-content: center
 
-  > svg
+  > svg,
+  > img
     width: 100%
     height: 100%
 

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()
     })