quasar 2.5.4 → 2.5.5

package/src/utils/morph.js

@@ -1,3 +1,5 @@
+import { isPlainObject } from './private/is'
+
 let id = 0
 let offsetBase = void 0
 
@@ -443,7 +445,7 @@ export default function morph (_options) {
       if (typeof options.style === 'string') {
         elTo.style.cssText += ' ' + options.style
       }
-      else if (options.style === Object(options.style)) {
+      else if (isPlainObject(options.style) === true) {
         for (const prop in options.style) {
           elTo.style[ prop ] = options.style[ prop ]
         }
@@ -880,8 +882,8 @@ export default function morph (_options) {
         elToClone.style.animation = `${ options.duration }ms ${ options.easing } ${ options.delay }ms ${ animationDirection } ${ options.fill } ${ qAnimId }-to`
         elTo.style.animation = `${ options.duration }ms ${ options.easing } ${ options.delay }ms ${ animationDirection } ${ options.fill } ${ qAnimId }`
 
-        const cleanup = ev => {
-          if (ev === Object(ev) && ev.animationName !== qAnimId) {
+        const cleanup = evt => {
+          if (evt === Object(evt) && evt.animationName !== qAnimId) {
             return
           }
 
@@ -944,24 +946,24 @@ export default function morph (_options) {
         : (
             options.waitFor === 'transitionend'
               ? new Promise(resolve => {
-                  const timer = setTimeout(() => {
-                    endFn()
-                  }, 400)
-
-                  const endFn = ev => {
-                    clearTimeout(timer)
+                const timer = setTimeout(() => {
+                  endFn()
+                }, 400)
 
-                    if (elTo) {
-                      elTo.removeEventListener('transitionend', endFn)
-                      elTo.removeEventListener('transitioncancel', endFn)
-                    }
+                const endFn = ev => {
+                  clearTimeout(timer)
 
-                    resolve()
+                  if (elTo) {
+                    elTo.removeEventListener('transitionend', endFn)
+                    elTo.removeEventListener('transitioncancel', endFn)
                   }
 
-                  elTo.addEventListener('transitionend', endFn)
-                  elTo.addEventListener('transitioncancel', endFn)
-                })
+                  resolve()
+                }
+
+                elTo.addEventListener('transitionend', endFn)
+                elTo.addEventListener('transitioncancel', endFn)
+              })
               : options.waitFor
           )
 

package/src/utils/private/is.js

@@ -120,17 +120,8 @@ export function isDeepEqual (a, b) {
   return a !== a && b !== b // eslint-disable-line no-self-compare
 }
 
-export function isPrintableChar (v) {
-  return (v > 47 && v < 58) // number keys
-    || v === 32 || v === 13 // spacebar & return key(s) (if you want to allow carriage returns)
-    || (v > 64 && v < 91) // letter keys
-    || (v > 95 && v < 112) // numpad keys
-    || (v > 185 && v < 193) // ;=,-./` (in order)
-    || (v > 218 && v < 223)
-}
-
-export function isObject (v) {
-  return Object(v) === v
+export function isPlainObject (v) {
+  return Object.prototype.toString.call(v) === '[object Object]'
 }
 
 export function isDate (v) {
@@ -144,7 +135,3 @@ export function isRegexp (v) {
 export function isNumber (v) {
   return typeof v === 'number' && isFinite(v)
 }
-
-export function isString (v) {
-  return typeof v === 'string'
-}

package/src/utils/private/web-storage.js

@@ -1,10 +1,11 @@
 import { noop } from '../event.js'
+import { isDate, isRegexp } from './is.js'
 
 function encode (value) {
-  if (Object.prototype.toString.call(value) === '[object Date]') {
+  if (isDate(value) === true) {
     return '__q_date|' + value.toUTCString()
   }
-  if (Object.prototype.toString.call(value) === '[object RegExp]') {
+  if (isRegexp(value) === true) {
     return '__q_expr|' + value.source
   }
   if (typeof value === 'number') {