quasar 1.18.4 → 1.18.7

package/src/plugins/Notify.js

@@ -8,6 +8,8 @@ import QSpinner from '../components/spinner/QSpinner.js'
 import { noop } from '../utils/event.js'
 import { getBodyFullscreenElement } from '../utils/dom.js'
 import debounce from '../utils/debounce.js'
+import { isObject } from '../utils/is.js'
+
 import { isSSR } from './Platform.js'
 
 let uid = 0, vm
@@ -71,7 +73,7 @@ function addNotification (config, vm, originalApi) {
     Object.assign(notif, defaults)
   }
 
-  if (Object(config) !== config) {
+  if (isObject(config) === false) {
     if (notif.type) {
       Object.assign(notif, notifTypes[notif.type])
     }
@@ -407,7 +409,8 @@ const Notifications = {
           if (notif.spinner !== false) {
             mainChild.push(
               h(notif.spinner, {
-                staticClass: 'q-notification__spinner q-notification__spinner--' + meta.leftClass
+                staticClass: 'q-notification__spinner q-notification__spinner--' + meta.leftClass,
+                props: { color: notif.spinnerColor, size: notif.spinnerSize }
               })
             )
           }
@@ -416,7 +419,7 @@ const Notifications = {
               h(QIcon, {
                 staticClass: 'q-notification__icon q-notification__icon--' + meta.leftClass,
                 attrs: { role: 'img' },
-                props: { name: notif.icon }
+                props: { name: notif.icon, color: notif.iconColor, size: notif.iconSize }
               })
             )
           }
@@ -518,13 +521,13 @@ const Notifications = {
 
 export default {
   setDefaults (opts) {
-    if (isSSR !== true && opts === Object(opts)) {
+    if (isSSR !== true && isObject(opts) === true) {
       Object.assign(defaults, opts)
     }
   },
 
   registerType (typeName, typeOpts) {
-    if (isSSR !== true && typeOpts === Object(typeOpts)) {
+    if (isSSR !== true && isObject(typeOpts) === true) {
       notifTypes[typeName] = typeOpts
     }
   },

package/src/plugins/Notify.json

@@ -45,6 +45,16 @@
         "extends": "icon"
       },
 
+      "iconColor": {
+        "extends": "color",
+        "addedIn": "v1.18.5"
+      },
+
+      "iconSize": {
+        "extends": "size",
+        "addedIn": "v1.18.5"
+      },
+
       "avatar": {
         "type": "String",
         "desc": "URL to an avatar/image; Suggestion: use public folder",
@@ -61,6 +71,16 @@
         "addedIn": "v1.14.0"
       },
 
+      "spinnerColor": {
+        "extends": "color",
+        "addedIn": "v1.18.5"
+      },
+
+      "spinnerSize": {
+        "extends": "size",
+        "addedIn": "v1.18.5"
+      },
+
       "position": {
         "type": "String",
         "desc": "Window side/corner to stick to",
@@ -215,6 +235,16 @@
               "extends": "icon"
             },
 
+            "iconColor": {
+              "extends": "color",
+              "addedIn": "v1.18.5"
+            },
+
+            "iconSize": {
+              "extends": "size",
+              "addedIn": "v1.18.5"
+            },
+
             "avatar": {
               "type": "String",
               "desc": "URL to an avatar/image; Suggestion: use public folder",
@@ -232,6 +262,16 @@
               "addedIn": "v1.14.0"
             },
 
+            "spinnerColor": {
+              "extends": "color",
+              "addedIn": "v1.18.5"
+            },
+
+            "spinnerSize": {
+              "extends": "size",
+              "addedIn": "v1.18.5"
+            },
+
             "position": {
               "type": "String",
               "desc": "Window side/corner to stick to",
@@ -413,6 +453,16 @@
                 "extends": "icon"
               },
 
+              "iconColor": {
+                "extends": "color",
+                "addedIn": "v1.18.5"
+              },
+
+              "iconSize": {
+                "extends": "size",
+                "addedIn": "v1.18.5"
+              },
+
               "avatar": {
                 "type": "String",
                 "desc": "URL to an avatar/image; Suggestion: use public folder",
@@ -430,6 +480,16 @@
                 "addedIn": "v1.14.0"
               },
 
+              "spinnerColor": {
+                "extends": "color",
+                "addedIn": "v1.18.5"
+              },
+
+              "spinnerSize": {
+                "extends": "size",
+                "addedIn": "v1.18.5"
+              },
+
               "progress": {
                 "type": "Boolean",
                 "desc": "Show progress bar to detail when notification will disappear automatically (unless timeout is 0)",
@@ -554,6 +614,16 @@
               "extends": "icon"
             },
 
+            "iconColor": {
+              "extends": "color",
+              "addedIn": "v1.18.5"
+            },
+
+            "iconSize": {
+              "extends": "size",
+              "addedIn": "v1.18.5"
+            },
+
             "avatar": {
               "type": "String",
               "desc": "URL to an avatar/image; Suggestion: use public folder",
@@ -571,6 +641,16 @@
               "addedIn": "v1.14.0"
             },
 
+            "spinnerColor": {
+              "extends": "color",
+              "addedIn": "v1.18.5"
+            },
+
+            "spinnerSize": {
+              "extends": "size",
+              "addedIn": "v1.18.5"
+            },
+
             "position": {
               "type": "String",
               "desc": "Window side/corner to stick to",
@@ -748,6 +828,16 @@
               "extends": "icon"
             },
 
+            "iconColor": {
+              "extends": "color",
+              "addedIn": "v1.18.5"
+            },
+
+            "iconSize": {
+              "extends": "size",
+              "addedIn": "v1.18.5"
+            },
+
             "avatar": {
               "type": "String",
               "desc": "URL to an avatar/image; Suggestion: use public folder",
@@ -765,6 +855,16 @@
               "addedIn": "v1.14.0"
             },
 
+            "spinnerColor": {
+              "extends": "color",
+              "addedIn": "v1.18.5"
+            },
+
+            "spinnerSize": {
+              "extends": "size",
+              "addedIn": "v1.18.5"
+            },
+
             "position": {
               "type": "String",
               "desc": "Window side/corner to stick to",

package/src/utils/extend.js

@@ -61,13 +61,13 @@ export default function extend () {
           continue
         }
 
-        if (deep && copy && (isPlainObject(copy) || (copyIsArray = type(copy) === 'array'))) {
+        if (deep && copy && (isPlainObject(copy) === true || (copyIsArray = type(copy) === 'array'))) {
           if (copyIsArray) {
             copyIsArray = false
             clone = src && type(src) === 'array' ? src : []
           }
           else {
-            clone = src && isPlainObject(src) ? src : {}
+            clone = src && isPlainObject(src) === true ? src : {}
           }
 
           target[name] = extend(deep, clone, copy)

package/src/utils/is.js

@@ -120,17 +120,11 @@ 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)
-}
-
+// not perfect, but what we ARE interested is for Arrays not to slip in
+// as spread operator will mess things up in various areas
+// see https://jsbench.me/tbl0iliyax/1
 export function isObject (v) {
-  return Object(v) === v
+  return v !== null && typeof v === 'object' && Array.isArray(v) !== true
 }
 
 export function isDate (v) {
@@ -144,7 +138,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/morph.js

@@ -1,4 +1,5 @@
 import { getElement } from './dom.js'
+import { isObject } from './is'
 
 let id = 0
 let offsetBase = void 0
@@ -433,7 +434,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 (isObject(options.style) === true) {
         for (const prop in options.style) {
           elTo.style[prop] = options.style[prop]
         }
@@ -870,8 +871,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
           }
 

package/src/utils/web-storage.js

@@ -1,10 +1,11 @@
 import { noop } from '../utils/event.js'
+import { isDate, isRegexp } from '../utils/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') {