quasar 1.16.2 → 1.17.2

package/src/plugins/Notify.json

@@ -47,9 +47,9 @@
 
       "avatar": {
         "type": "String",
-        "desc": "URL to an avatar/image; Suggestion: use statics folder",
+        "desc": "URL to an avatar/image; Suggestion: use public folder",
         "examples": [
-          "(statics folder) statics/img/something.png",
+          "(public folder) img/something.png",
           "(relative path format) require('./my_img.jpg')",
           "(URL) https://some-site.net/some-img.gif"
         ]
@@ -217,9 +217,9 @@
 
             "avatar": {
               "type": "String",
-              "desc": "URL to an avatar/image; Suggestion: use statics folder",
+              "desc": "URL to an avatar/image; Suggestion: use public folder",
               "examples": [
-                "(statics folder) statics/img/something.png",
+                "(public folder) img/something.png",
                 "(relative path format) require('./my_img.jpg')",
                 "(URL) https://some-site.net/some-img.gif"
               ]
@@ -278,7 +278,7 @@
               "desc": "Style definitions to be attributed to the badge",
               "examples": [
                 "background-color: #ff0000",
-                ":content-style=\"{ backgroundColor: '#ff0000' }\""
+                "{ backgroundColor: '#ff0000' }"
               ],
               "addedIn": "v1.9.0"
             },
@@ -287,7 +287,7 @@
               "desc": "Class definitions to be attributed to the badge",
               "examples": [
                 "my-special-class",
-                ":content-class=\"{ 'my-special-class': <condition> }\""
+                "{ 'my-special-class': <condition> }"
               ],
               "addedIn": "v1.9.0"
             },
@@ -302,7 +302,7 @@
               "desc": "Class definitions to be attributed to the progress bar",
               "examples": [
                 "my-special-class",
-                ":content-class=\"{ 'my-special-class': <condition> }\""
+                "{ 'my-special-class': <condition> }"
               ],
               "addedIn": "v1.9.0"
             },
@@ -415,9 +415,9 @@
 
               "avatar": {
                 "type": "String",
-                "desc": "URL to an avatar/image; Suggestion: use statics folder",
+                "desc": "URL to an avatar/image; Suggestion: use public folder",
                 "examples": [
-                  "(statics folder) statics/img/something.png",
+                  "(public folder) img/something.png",
                   "(relative path format) require('./my_img.jpg')",
                   "(URL) https://some-site.net/some-img.gif"
                 ]
@@ -440,7 +440,7 @@
                 "desc": "Class definitions to be attributed to the progress bar",
                 "examples": [
                   "my-special-class",
-                  ":content-class=\"{ 'my-special-class': <condition> }\""
+                  "{ 'my-special-class': <condition> }"
                 ],
                 "addedIn": "v1.9.0"
               },
@@ -556,9 +556,9 @@
 
             "avatar": {
               "type": "String",
-              "desc": "URL to an avatar/image; Suggestion: use statics folder",
+              "desc": "URL to an avatar/image; Suggestion: use public folder",
               "examples": [
-                "(statics folder) statics/img/something.png",
+                "(public folder) img/something.png",
                 "(relative path format) require('./my_img.jpg')",
                 "(URL) https://some-site.net/some-img.gif"
               ]
@@ -609,7 +609,7 @@
               "desc": "Style definitions to be attributed to the badge",
               "examples": [
                 "background-color: #ff0000",
-                ":content-style=\"{ backgroundColor: '#ff0000' }\""
+                "{ backgroundColor: '#ff0000' }"
               ],
               "addedIn": "v1.9.0"
             },
@@ -618,7 +618,7 @@
               "desc": "Class definitions to be attributed to the badge",
               "examples": [
                 "my-special-class",
-                ":content-class=\"{ 'my-special-class': <condition> }\""
+                "{ 'my-special-class': <condition> }"
               ],
               "addedIn": "v1.9.0"
             },
@@ -633,7 +633,7 @@
               "desc": "Class definitions to be attributed to the progress bar",
               "examples": [
                 "my-special-class",
-                ":content-class=\"{ 'my-special-class': <condition> }\""
+                "{ 'my-special-class': <condition> }"
               ],
               "addedIn": "v1.9.0"
             },
@@ -750,9 +750,9 @@
 
             "avatar": {
               "type": "String",
-              "desc": "URL to an avatar/image; Suggestion: use statics folder",
+              "desc": "URL to an avatar/image; Suggestion: use public folder",
               "examples": [
-                "(statics folder) statics/img/something.png",
+                "(public folder) img/something.png",
                 "(relative path format) require('./my_img.jpg')",
                 "(URL) https://some-site.net/some-img.gif"
               ]
@@ -803,7 +803,7 @@
               "desc": "Style definitions to be attributed to the badge",
               "examples": [
                 "background-color: #ff0000",
-                ":content-style=\"{ backgroundColor: '#ff0000' }\""
+                "{ backgroundColor: '#ff0000' }"
               ],
               "addedIn": "v1.9.0"
             },
@@ -812,7 +812,7 @@
               "desc": "Class definitions to be attributed to the badge",
               "examples": [
                 "my-special-class",
-                ":content-class=\"{ 'my-special-class': <condition> }\""
+                "{ 'my-special-class': <condition> }"
               ],
               "addedIn": "v1.9.0"
             },
@@ -827,7 +827,7 @@
               "desc": "Class definitions to be attributed to the progress bar",
               "examples": [
                 "my-special-class",
-                ":content-class=\"{ 'my-special-class': <condition> }\""
+                "{ 'my-special-class': <condition> }"
               ],
               "addedIn": "v1.9.0"
             },

package/src/plugins/Notify.sass

@@ -40,16 +40,22 @@ body.q-ios-padding .q-notifications__list
 
   &__icon
     font-size: 24px
-    margin-right: 16px
     flex: 0 0 1em
 
+    &--additional
+      margin-right: 16px
+
   &__avatar
     font-size: 32px
-    margin-right: 8px
+
+    &--additional
+      margin-right: 8px
 
   &__spinner
     font-size: 32px
-    margin-right: 8px
+
+    &--additional
+      margin-right: 8px
 
   &__message
     padding: 8px 0

package/src/plugins/Notify.styl

@@ -40,16 +40,22 @@ body.q-ios-padding .q-notifications__list
 
   &__icon
     font-size: 24px
-    margin-right: 16px
     flex: 0 0 1em
 
+    &--additional
+      margin-right: 16px
+
   &__avatar
     font-size: 32px
-    margin-right: 8px
+
+    &--additional
+      margin-right: 8px
 
   &__spinner
     font-size: 32px
-    margin-right: 8px
+
+    &--additional
+      margin-right: 8px
 
   &__message
     padding: 8px 0

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

@@ -3,7 +3,7 @@
 import { isDate } from './is.js'
 import { pad, capitalize } from './format.js'
 import { jalaaliMonthLength } from './date-persian.js'
-import lang from '../lang.js'
+import lang, { defaultLang } from '../lang.js'
 
 const
   MILLISECONDS_IN_DAY = 86400000,
@@ -151,6 +151,128 @@ function getRegexData (mask, dateLocale) {
   return res
 }
 
+function getDateLocale (paramDateLocale, langProps) {
+  return paramDateLocale !== void 0
+    ? paramDateLocale
+    : (
+      langProps !== void 0
+        ? langProps.date
+        : defaultLang.date
+    )
+}
+
+function formatTimezone (offset, delimeter = '') {
+  const
+    sign = offset > 0 ? '-' : '+',
+    absOffset = Math.abs(offset),
+    hours = Math.floor(absOffset / 60),
+    minutes = absOffset % 60
+
+  return sign + pad(hours) + delimeter + pad(minutes)
+}
+
+function applyYearMonthDayChange (date, mod, sign) {
+  let
+    year = date.getFullYear(),
+    month = date.getMonth(),
+    day = date.getDate()
+
+  if (mod.years !== void 0) {
+    year += sign * mod.years
+  }
+  else if (mod.year !== void 0) {
+    year += sign * mod.year
+  }
+
+  if (mod.months !== void 0) {
+    month += sign * mod.months
+  }
+  else if (mod.month !== void 0) {
+    month += sign * mod.month
+  }
+
+  if (mod.days !== void 0) {
+    day += sign * mod.days
+  }
+
+  date.setDate(1)
+  date.setMonth(2)
+
+  date.setFullYear(year)
+  date.setMonth(month)
+  date.setDate(day)
+
+  return date
+}
+
+const yearMonDay = [ 'years', 'year', 'months', 'month', 'days' ]
+
+function getChange (date, mod, sign) {
+  const
+    d = new Date(date),
+    t = (
+      mod.years !== void 0 || mod.year !== void 0 ||
+      mod.months !== void 0 || mod.month !== void 0 ||
+      mod.days !== void 0
+    )
+      ? applyYearMonthDayChange(d, mod, sign)
+      : d
+
+  for (const key in mod) {
+    if (yearMonDay.includes(key) === false) {
+      const op = capitalize(key)
+      t[`set${op}`](t[`get${op}`]() + sign * mod[key])
+    }
+  }
+
+  return t
+}
+
+function applyYearMonthDay (date, mod, middle) {
+  const
+    year = mod.year !== void 0
+      ? mod.year
+      : (mod.years !== void 0 ? mod.years : date[`get${middle}FullYear`]()),
+    month = mod.month !== void 0
+      ? mod.month - 1
+      : (mod.months !== void 0 ? mod.months : date[`get${middle}Month`]()),
+    maxDay = (new Date(year, month + 1, 0)).getDate(),
+    day = Math.min(maxDay, mod.date !== void 0 ? mod.date : date[`get${middle}Date`]())
+
+  date[`set${middle}Date`](1)
+  date[`set${middle}Month`](2)
+
+  date[`set${middle}FullYear`](year)
+  date[`set${middle}Month`](month)
+  date[`set${middle}Date`](day)
+
+  return date
+}
+
+const yearMonDayAdj = [ 'years', 'year', 'months', 'month', 'days' ]
+
+export function adjustDate (date, mod, utc) {
+  const
+    middle = utc === true ? 'UTC' : '',
+    d = new Date(date),
+    t = (
+      mod.years !== void 0 || mod.year !== void 0 ||
+      mod.months !== void 0 || mod.month !== void 0 ||
+      mod.days !== void 0
+    )
+      ? applyYearMonthDay(d, mod, middle)
+      : d
+
+  for (const key in mod) {
+    if (yearMonDayAdj.includes(key) === false) {
+      const op = key.charAt(0).toUpperCase() + key.slice(1)
+      t[`set${middle}${op}`](mod[key])
+    }
+  }
+
+  return t
+}
+
 export function extractDate (str, mask, dateLocale) {
   const d = __splitDate(str, mask, dateLocale)
 
@@ -168,7 +290,7 @@ export function extractDate (str, mask, dateLocale) {
 
   return d.timezoneOffset === null || d.timezoneOffset === tzOffset
     ? date
-    : getChange(date, { minutes: d.timezoneOffset - tzOffset }, true)
+    : getChange(date, { minutes: d.timezoneOffset - tzOffset }, 1)
 }
 
 export function __splitDate (str, mask, dateLocale, calendar, defaultModel) {
@@ -201,7 +323,7 @@ export function __splitDate (str, mask, dateLocale, calendar, defaultModel) {
   }
 
   const
-    langOpts = dateLocale !== void 0 ? dateLocale : lang.props.date,
+    langOpts = getDateLocale(dateLocale, lang.props),
     months = langOpts.months,
     monthsShort = langOpts.monthsShort
 
@@ -303,49 +425,12 @@ export function __splitDate (str, mask, dateLocale, calendar, defaultModel) {
     }
   }
 
-  date.dateHash = date.year + '/' + pad(date.month) + '/' + pad(date.day)
+  date.dateHash = pad(date.year, 6) + '/' + pad(date.month) + '/' + pad(date.day)
   date.timeHash = pad(date.hour) + ':' + pad(date.minute) + ':' + pad(date.second) + tzString
 
   return date
 }
 
-function formatTimezone (offset, delimeter = '') {
-  const
-    sign = offset > 0 ? '-' : '+',
-    absOffset = Math.abs(offset),
-    hours = Math.floor(absOffset / 60),
-    minutes = absOffset % 60
-
-  return sign + pad(hours) + delimeter + pad(minutes)
-}
-
-function setMonth (date, newMonth /* 1-based */) {
-  const
-    test = new Date(date.getFullYear(), newMonth, 0, 0, 0, 0, 0),
-    days = test.getDate()
-
-  date.setMonth(newMonth - 1, Math.min(days, date.getDate()))
-}
-
-function getChange (date, mod, add) {
-  const
-    t = new Date(date),
-    sign = (add ? 1 : -1)
-
-  Object.keys(mod).forEach(key => {
-    if (key === 'month') {
-      setMonth(t, t.getMonth() + 1 + sign * mod.month)
-      return
-    }
-
-    const op = key === 'year'
-      ? 'FullYear'
-      : capitalize(key === 'days' ? 'date' : key)
-    t[`set${op}`](t[`get${op}`]() + sign * mod[key])
-  })
-  return t
-}
-
 export function isValid (date) {
   return typeof date === 'number'
     ? true
@@ -403,30 +488,10 @@ export function isBetweenDates (date, from, to, opts = {}) {
 }
 
 export function addToDate (date, mod) {
-  return getChange(date, mod, true)
+  return getChange(date, mod, 1)
 }
 export function subtractFromDate (date, mod) {
-  return getChange(date, mod, false)
-}
-
-export function adjustDate (date, mod, utc) {
-  const
-    t = new Date(date),
-    prefix = `set${utc === true ? 'UTC' : ''}`
-
-  Object.keys(mod).forEach(key => {
-    if (key === 'month') {
-      setMonth(t, mod.month)
-      return
-    }
-
-    const op = key === 'year'
-      ? 'FullYear'
-      : key.charAt(0).toUpperCase() + key.slice(1)
-    t[`${prefix}${op}`](mod[key])
-  })
-
-  return t
+  return getChange(date, mod, -1)
 }
 
 export function startOfDate (date, unit, utc) {
@@ -843,15 +908,15 @@ export function formatDate (val, mask, dateLocale, __forcedYear, __forcedTimezon
     mask = defaultMask
   }
 
-  const locale = dateLocale !== void 0
-    ? dateLocale
-    : lang.props.date
+  const locale = getDateLocale(dateLocale, lang.props)
 
   return mask.replace(
     token,
-    (match, text) => match in formatter
-      ? formatter[match](date, locale, __forcedYear, __forcedTimezoneOffset)
-      : (text === void 0 ? match : text.split('\\]').join(']'))
+    (match, text) => (
+      match in formatter
+        ? formatter[match](date, locale, __forcedYear, __forcedTimezoneOffset)
+        : (text === void 0 ? match : text.split('\\]').join(']'))
+    )
   )
 }
 

package/src/utils/dom.js

@@ -46,6 +46,30 @@ export function ready (fn) {
   document.addEventListener('DOMContentLoaded', fn, false)
 }
 
+// internal
+export function getElement (el) {
+  const type = typeof el
+
+  if (type === 'function') {
+    el = el()
+  }
+
+  if (type === 'string') {
+    try {
+      el = document.querySelector(el)
+    }
+    catch (err) {}
+  }
+
+  if (el !== Object(el)) {
+    return null
+  }
+
+  return el._isVue === true && el.$el !== void 0
+    ? el.$el
+    : el
+}
+
 // internal
 export function childHasFocus (el, focusedEl) {
   if (el === void 0 || el.contains(focusedEl) === true) {
@@ -62,15 +86,10 @@ export function childHasFocus (el, focusedEl) {
 }
 
 // internal
-export function getBodyFullscreenElement (isFullscreen, activeEl) {
-  return isFullscreen === true
-    ? (
-      // when a video tag enters fullscreen activeEl is null
-      activeEl === document.documentElement || activeEl === null
-        ? document.body
-        : activeEl
-    )
-    : document.body
+export function getBodyFullscreenElement (activeEl) {
+  return activeEl === document.documentElement || activeEl === null
+    ? document.body
+    : activeEl
 }
 
 export default {

package/src/utils/extend.js

@@ -25,7 +25,7 @@ function isPlainObject (obj) {
   let key
   for (key in obj) {}
 
-  return key === undefined || hasOwn.call(obj, key)
+  return key === void 0 || hasOwn.call(obj, key)
 }
 
 export default function extend () {
@@ -72,7 +72,7 @@ export default function extend () {
 
           target[name] = extend(deep, clone, copy)
         }
-        else if (copy !== undefined) {
+        else if (copy !== void 0) {
           target[name] = copy
         }
       }

package/src/utils/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/global-dialog.js

@@ -24,6 +24,23 @@ export function merge (target, source) {
   }
 }
 
+let appRoot
+
+function getDialogParent (parent, root) {
+  if (parent !== void 0) { return parent }
+  if (root !== void 0) { return root }
+
+  if (appRoot === void 0) {
+    const elRoot = document.getElementById('q-app')
+
+    if (elRoot && elRoot.__vue__) {
+      appRoot = elRoot.__vue__.$root
+    }
+  }
+
+  return appRoot
+}
+
 export default function (DefaultComponent) {
   return ({ className, class: klass, style, component, root, parent, ...props }) => {
     if (isSSR === true) { return ssrAPI }
@@ -113,7 +130,7 @@ export default function (DefaultComponent) {
       name: 'QGlobalDialog',
 
       el: node,
-      parent: parent === void 0 ? root : parent,
+      parent: getDialogParent(parent, root),
 
       render (h) {
         return h(DialogComponent, {

package/src/utils/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
     }