quasar 2.6.1 → 2.6.4

package/src/utils/date.js

@@ -734,16 +734,16 @@ function getOrdinal (n) {
 
 const formatter = {
   // Year: 00, 01, ..., 99
-  YY (date, _, forcedYear) {
+  YY (date, dateLocale, forcedYear) {
     // workaround for < 1900 with new Date()
-    const y = this.YYYY(date, _, forcedYear) % 100
+    const y = this.YYYY(date, dateLocale, forcedYear) % 100
     return y > 0
       ? pad(y)
       : '-' + pad(Math.abs(y))
   },
 
   // Year: 1900, 1901, ..., 2099
-  YYYY (date, _, forcedYear) {
+  YYYY (date, _dateLocale, forcedYear) {
     // workaround for < 1900 with new Date()
     return forcedYear !== void 0 && forcedYear !== null
       ? forcedYear
@@ -853,13 +853,9 @@ const formatter = {
   // Hour: 1, 2, ..., 12
   h (date) {
     const hours = date.getHours()
-    if (hours === 0) {
-      return 12
-    }
-    if (hours > 12) {
-      return hours % 12
-    }
-    return hours
+    return hours === 0
+      ? 12
+      : (hours > 12 ? hours % 12 : hours)
   },
 
   // Hour: 01, 02, ..., 12
@@ -918,7 +914,7 @@ const formatter = {
   },
 
   // Timezone: -01:00, +00:00, ... +12:00
-  Z (date, dateLocale, forcedYear, forcedTimezoneOffset) {
+  Z (date, _dateLocale, _forcedYear, forcedTimezoneOffset) {
     const tzOffset = forcedTimezoneOffset === void 0 || forcedTimezoneOffset === null
       ? date.getTimezoneOffset()
       : forcedTimezoneOffset
@@ -927,7 +923,7 @@ const formatter = {
   },
 
   // Timezone: -0100, +0000, ... +1200
-  ZZ (date, dateLocale, forcedYear, forcedTimezoneOffset) {
+  ZZ (date, _dateLocale, _forcedYear, forcedTimezoneOffset) {
     const tzOffset = forcedTimezoneOffset === void 0 || forcedTimezoneOffset === null
       ? date.getTimezoneOffset()
       : forcedTimezoneOffset

package/src/utils/extend.js

@@ -1,4 +1,32 @@
-import { isObject } from './private/is'
+const
+  toString = Object.prototype.toString,
+  hasOwn = Object.prototype.hasOwnProperty,
+  class2type = {}
+
+'Boolean Number String Function Array Date RegExp Object'.split(' ').forEach(name => {
+  class2type[ '[object ' + name + ']' ] = name.toLowerCase()
+})
+
+function type (obj) {
+  return obj === null ? String(obj) : class2type[ toString.call(obj) ] || 'object'
+}
+
+function isPlainObject (obj) {
+  if (!obj || type(obj) !== 'object') {
+    return false
+  }
+
+  if (obj.constructor
+    && !hasOwn.call(obj, 'constructor')
+    && !hasOwn.call(obj.constructor.prototype, 'isPrototypeOf')) {
+    return false
+  }
+
+  let key
+  for (key in obj) {} // eslint-disable-line
+
+  return key === void 0 || hasOwn.call(obj, key)
+}
 
 export default function extend () {
   let
@@ -14,7 +42,7 @@ export default function extend () {
     i = 2
   }
 
-  if (Object(target) !== target && typeof target !== 'function') {
+  if (Object(target) !== target && type(target) !== 'function') {
     target = {}
   }
 
@@ -33,13 +61,13 @@ export default function extend () {
           continue
         }
 
-        if (deep && copy && (isObject(copy) === true || (copyIsArray = Array.isArray(copy) === true))) {
+        if (deep && copy && (isPlainObject(copy) || (copyIsArray = type(copy) === 'array'))) {
           if (copyIsArray) {
             copyIsArray = false
-            clone = src && Array.isArray(src) === true ? src : []
+            clone = src && type(src) === 'array' ? src : []
           }
           else {
-            clone = src && isObject(src) === true ? src : {}
+            clone = src && isPlainObject(src) ? src : {}
           }
 
           target[ name ] = extend(deep, clone, copy)