quasar 2.3.4 → 2.4.3

package/src/plugins/Platform.js

@@ -3,6 +3,7 @@
 /* eslint-disable no-mixed-operators */
 
 import { ref, reactive } from 'vue'
+import { injectProp } from '../utils/private/inject-obj-prop'
 
 /**
  * __ QUASAR_SSR __            -> runs on SSR on client or server
@@ -330,23 +331,22 @@ else {
   // devland actually using it as this will get
   // reported under "Cookies" in Google Chrome
   let hasWebStorage
-  Object.defineProperty(client.has, 'webStorage', {
-    get: () => {
-      if (hasWebStorage !== void 0) {
-        return hasWebStorage
-      }
 
-      try {
-        if (window.localStorage) {
-          hasWebStorage = true
-          return true
-        }
-      }
-      catch (e) {}
+  injectProp(client.has, 'webStorage', () => {
+    if (hasWebStorage !== void 0) {
+      return hasWebStorage
+    }
 
-      hasWebStorage = false
-      return false
+    try {
+      if (window.localStorage) {
+        hasWebStorage = true
+        return true
+      }
     }
+    catch (e) {}
+
+    hasWebStorage = false
+    return false
   })
 
   iosEmulated = client.is.ios === true

package/src/utils/clone.js

@@ -1,6 +1,55 @@
-export default function (data) {
-  const s = JSON.stringify(data)
-  if (s) {
-    return JSON.parse(s)
+// adapted from https://stackoverflow.com/a/40294058
+
+export default function cloneDeep (data, hash = new WeakMap()) {
+  if (Object(data) !== data) return data
+  if (hash.has(data)) return hash.get(data)
+
+  const result = data instanceof Date
+    ? new Date(data)
+    : (data instanceof RegExp
+        ? new RegExp(data.source, data.flags)
+        : (data instanceof Set
+            ? new Set()
+            : (data instanceof Map
+                ? new Map()
+                : (typeof data.constructor !== 'function'
+                    ? Object.create(null)
+                    : (data.prototype !== void 0 && typeof data.prototype.constructor === 'function'
+                        ? data
+                        : new data.constructor()
+                      )
+                  )
+              )
+          )
+      )
+
+  if (typeof data.constructor === 'function' && typeof data.valueOf === 'function') {
+    const val = data.valueOf()
+
+    if (Object(val) !== val) {
+      const result = new data.constructor(val)
+
+      hash.set(data, result)
+
+      return result
+    }
   }
+
+  hash.set(data, result)
+
+  if (data instanceof Set) {
+    data.forEach(val => {
+      result.add(cloneDeep(val, hash))
+    })
+  }
+  else if (data instanceof Map) {
+    data.forEach((val, key) => {
+      result.set(key, cloneDeep(val, hash))
+    })
+  }
+
+  return Object.assign(
+    result,
+    ...Object.keys(data).map(key => ({ [ key ]: cloneDeep(data[ key ], hash) }))
+  )
 }

package/src/utils/date.js

@@ -206,12 +206,12 @@ function getChange (date, mod, sign) {
       ? applyYearMonthDayChange(d, mod, sign)
       : d
 
-  Object.keys(mod).forEach(key => {
+  for (const key in mod) {
     if (key !== 'years' && key !== 'months' && key !== 'days') {
       const op = capitalize(key)
       t[ `set${ op }` ](t[ `get${ op }` ]() + sign * mod[ key ])
     }
-  })
+  }
 
   return t
 }
@@ -241,12 +241,12 @@ export function adjustDate (date, mod, utc) {
       ? applyYearMonthDay(d, mod, middle)
       : d
 
-  Object.keys(mod).forEach(key => {
+  for (const key in mod) {
     if (key !== 'year' && key !== 'month' && key !== 'date') {
       const op = key.charAt(0).toUpperCase() + key.slice(1)
       t[ `set${ middle }${ op }` ](mod[ key ])
     }
-  })
+  }
 
   return t
 }

package/src/utils/dom.js

@@ -27,9 +27,9 @@ export function width (el) {
 export function css (element, css) {
   const style = element.style
 
-  Object.keys(css).forEach(prop => {
+  for (const prop in css) {
     style[ prop ] = css[ prop ]
-  })
+  }
 }
 
 export function cssBatch (elements, style) {

package/src/utils/open-url.js

@@ -5,11 +5,11 @@ import { noop } from '../utils/event.js'
 function parseFeatures (winFeatures) {
   const cfg = Object.assign({ noopener: true }, winFeatures)
   const feat = []
-  Object.keys(cfg).forEach(key => {
+  for (const key in cfg) {
     if (cfg[ key ] === true) {
       feat.push(key)
     }
-  })
+  }
   return feat.join(',')
 }
 

package/src/utils/patterns.js

@@ -7,6 +7,7 @@ const
   rgb = /^rgb\(((0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5]),){2}(0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5])\)$/,
   rgba = /^rgba\(((0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5]),){2}(0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5]),(0|0\.[0-9]+[1-9]|0\.[1-9]+|1)\)$/
 
+// Keep in sync with ui/types/api/validation.d.ts
 export const testPattern = {
   date: v => /^-?[\d]+\/[0-1]\d\/[0-3]\d$/.test(v),
   time: v => /^([0-1]?\d|2[0-3]):[0-5]\d$/.test(v),

package/src/utils/private/define-reactive-plugin.js

@@ -1,4 +1,6 @@
+
 import { reactive } from 'vue'
+import { injectProp } from './inject-obj-prop'
 
 export default __QUASAR_SSR_SERVER__
   ? (state, plugin) => {
@@ -6,16 +8,16 @@ export default __QUASAR_SSR_SERVER__
       return plugin
     }
   : (state, plugin) => {
-      const props = {}
       const reactiveState = reactive(state)
 
-      Object.keys(state).forEach(name => {
-        props[ name ] = {
-          get: () => reactiveState[ name ],
-          set: val => { reactiveState[ name ] = val }
-        }
-      })
+      for (const name in state) {
+        injectProp(
+          plugin,
+          name,
+          () => reactiveState[ name ],
+          val => { reactiveState[ name ] = val }
+        )
+      }
 
-      Object.defineProperties(plugin, props)
       return plugin
     }

package/src/utils/private/focus-manager.js

@@ -1,15 +1,17 @@
 let queue = []
-const waitFlags = []
+let waitFlags = []
+
+function clearFlag (flag) {
+  waitFlags = waitFlags.filter(entry => entry !== flag)
+}
 
 export function addFocusWaitFlag (flag) {
+  clearFlag(flag)
   waitFlags.push(flag)
 }
 
 export function removeFocusWaitFlag (flag) {
-  const index = waitFlags.indexOf(flag)
-  if (index !== -1) {
-    waitFlags.splice(index, 1)
-  }
+  clearFlag(flag)
 
   if (waitFlags.length === 0 && queue.length > 0) {
     // only call last focus handler (can't focus multiple things at once)
@@ -24,13 +26,9 @@ export function addFocusFn (fn) {
   }
   else {
     queue.push(fn)
-    return fn
   }
 }
 
 export function removeFocusFn (fn) {
-  const index = queue.indexOf(fn)
-  if (index !== -1) {
-    queue.splice(index, 1)
-  }
+  queue = queue.filter(entry => entry !== fn)
 }

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

@@ -133,14 +133,12 @@ export default function (DefaultComponent, supportsCustomComponent, parentApp) {
 
     let app = createChildApp({
       name: 'QGlobalDialog',
-      setup () {
-        return () => h(DialogComponent, {
-          ref: dialogRef,
-          ...props,
-          onOk,
-          onHide
-        })
-      }
+      setup: () => () => h(DialogComponent, {
+        ...props,
+        ref: dialogRef,
+        onOk,
+        onHide
+      })
     }, parentApp)
 
     vm = app.mount(el)

package/src/utils/private/inject-obj-prop.js

@@ -0,0 +1,13 @@
+export function injectProp (target, propName, get, set) {
+  Object.defineProperty(target, propName, {
+    get,
+    set,
+    enumerable: true
+  })
+}
+
+export function injectMultipleProps (target, props) {
+  for (const key in props) {
+    injectProp(target, key, props[ key ])
+  }
+}

package/src/utils/private/is.js

@@ -99,10 +99,10 @@ export function isDeepEqual (a, b) {
       return a.toString() === b.toString()
     }
 
-    const keys = Object.keys(a)
+    const keys = Object.keys(a).filter(key => a[ key ] !== void 0)
     length = keys.length
 
-    if (length !== Object.keys(b).length) {
+    if (length !== Object.keys(b).filter(key => b[ key ] !== void 0).length) {
       return false
     }