quasar 1.18.4 → 1.18.7

package/dist/quasar.umd.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v1.18.4
+ * Quasar Framework v1.18.7
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -12,7 +12,7 @@
 
   Vue = Vue && Object.prototype.hasOwnProperty.call(Vue, 'default') ? Vue['default'] : Vue;
 
-  var version = "1.18.4";
+  var version = "1.18.7";
 
   /* eslint-disable no-useless-escape */
 
@@ -2410,6 +2410,7 @@
   var svgUseRE = /^svguse:/;
   var ionRE = /^ion-/;
   var faLaRE = /^[lf]a[srlbdk]? /;
+  var fa6RE = /^fa-(solid|regular|light|brands|duotone|thin)/;
 
   var QIcon = Vue.extend({
     name: 'QIcon',
@@ -2442,7 +2443,7 @@
         var cls;
         var icon = this.name;
 
-        if (!icon) {
+        if (icon === 'none' || !icon) {
           return { none: true }
         }
 
@@ -2451,6 +2452,9 @@
           if (res !== void 0) {
             if (res.icon !== void 0) {
               icon = res.icon;
+              if (icon === 'none' || !icon) {
+                return { none: true }
+              }
             }
             else {
               return {
@@ -2509,7 +2513,7 @@
         if (matches !== null) {
           cls = libMap[ matches[ 1 ] ](icon);
         }
-        else if (faLaRE.test(icon) === true) {
+        else if (faLaRE.test(icon) === true || fa6RE.test(icon) === true) {
           cls = icon;
         }
         else if (ionRE.test(icon) === true) {
@@ -3767,34 +3771,41 @@
       },
 
       __onKeydown: function __onKeydown (e) {
-        if (isKeyCode(e, [ 13, 32 ]) === true) {
-          stopAndPrevent(e);
+        this.$emit('keydown', e);
 
+        if (isKeyCode(e, [ 13, 32 ]) === true) {
           if (keyboardTarget !== this.$el) {
             keyboardTarget !== void 0 && this.__cleanup();
 
-            // focus external button if the focus helper was focused before
-            this.$el.focus();
+            if (e.defaultPrevented !== true) {
+              // focus external button if the focus helper was focused before
+              this.$el.focus();
 
-            keyboardTarget = this.$el;
-            this.$el.classList.add('q-btn--active');
-            document.addEventListener('keyup', this.__onPressEnd, true);
-            this.$el.addEventListener('blur', this.__onPressEnd, passiveCapture);
+              keyboardTarget = this.$el;
+              this.$el.classList.add('q-btn--active');
+              document.addEventListener('keyup', this.__onPressEnd, true);
+              this.$el.addEventListener('blur', this.__onPressEnd, passiveCapture);
+            }
           }
-        }
 
-        this.$emit('keydown', e);
+          stopAndPrevent(e);
+        }
       },
 
       __onTouchstart: function __onTouchstart (e) {
         var this$1 = this;
 
+        this.$emit('touchstart', e);
+
         if (touchTarget !== this.$el) {
           touchTarget !== void 0 && this.__cleanup();
-          touchTarget = this.$el;
-          var target = this.touchTargetEl = e.target;
-          target.addEventListener('touchcancel', this.__onPressEnd, passiveCapture);
-          target.addEventListener('touchend', this.__onPressEnd, passiveCapture);
+
+          if (e.defaultPrevented !== true) {
+            touchTarget = this.$el;
+            var target = this.touchTargetEl = e.target;
+            target.addEventListener('touchcancel', this.__onPressEnd, passiveCapture);
+            target.addEventListener('touchend', this.__onPressEnd, passiveCapture);
+          }
         }
 
         // avoid duplicated mousedown event
@@ -3804,20 +3815,21 @@
         this.mouseTimer = setTimeout(function () {
           this$1.avoidMouseRipple = false;
         }, 200);
-
-        this.$emit('touchstart', e);
       },
 
       __onMousedown: function __onMousedown (e) {
+        e.qSkipRipple = this.avoidMouseRipple === true;
+        this.$emit('mousedown', e);
+
         if (mouseTarget !== this.$el) {
           mouseTarget !== void 0 && this.__cleanup();
-          mouseTarget = this.$el;
-          this.$el.classList.add('q-btn--active');
-          document.addEventListener('mouseup', this.__onPressEnd, passiveCapture);
-        }
 
-        e.qSkipRipple = this.avoidMouseRipple === true;
-        this.$emit('mousedown', e);
+          if (e.defaultPrevented !== true) {
+            mouseTarget = this.$el;
+            this.$el.classList.add('q-btn--active');
+            document.addEventListener('mouseup', this.__onPressEnd, passiveCapture);
+          }
+        }
       },
 
       __onPressEnd: function __onPressEnd (e) {
@@ -6996,10 +7008,21 @@
     return a !== a && b !== b // eslint-disable-line no-self-compare
   }
 
+  // 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
+  function isObject (v) {
+    return v !== null && typeof v === 'object' && Array.isArray(v) !== true
+  }
+
   function isDate (v) {
     return Object.prototype.toString.call(v) === '[object Date]'
   }
 
+  function isRegexp (v) {
+    return Object.prototype.toString.call(v) === '[object RegExp]'
+  }
+
   function isNumber (v) {
     return typeof v === 'number' && isFinite(v)
   }
@@ -9034,7 +9057,7 @@
         if (typeof def === 'function') {
           return this.markerTicks.map(function (value) {
             var item = def(value);
-            return Object(item) === item ? Object.assign({}, item, {value: value}) : { value: value, label: item }
+            return isObject(item) === true ? Object.assign({}, item, {value: value}) : { value: value, label: item }
           })
         }
 
@@ -9046,14 +9069,14 @@
 
         if (Array.isArray(def) === true) {
           return def
-            .map(function (item) { return (Object(item) === item ? item : { value: item }); })
+            .map(function (item) { return (isObject(item) === true ? item : { value: item }); })
             .filter(filterFn)
         }
 
         return Object.keys(def).map(function (key) {
           var item = def[ key ];
           var value = Number(key);
-          return Object(item) === item ? Object.assign({}, item, {value: value}) : { value: value, label: item }
+          return isObject(item) === true ? Object.assign({}, item, {value: value}) : { value: value, label: item }
         }).filter(filterFn)
       },
 
@@ -11764,7 +11787,9 @@
 
     methods: {
       __getLocale: function __getLocale () {
-        return this.locale || this.$q.lang.date
+        return this.locale !== void 0
+          ? Object.assign({}, this.$q.lang.date, this.locale)
+          : this.$q.lang.date
       },
 
       __getCurrentDate: function __getCurrentDate (dateOnly) {
@@ -12977,7 +13002,7 @@
 
         var fn = function (date) { return this$1.__decodeString(date, this$1.innerMask, this$1.innerLocale); };
         return this.normalizedModel
-          .filter(function (date) { return Object(date) === date && date.from !== void 0 && date.to !== void 0; })
+          .filter(function (date) { return isObject(date) === true && date.from !== void 0 && date.to !== void 0; })
           .map(function (range) { return ({ from: fn(range.from), to: fn(range.to) }); })
           .filter(function (range) { return range.from.dateHash !== null && range.to.dateHash !== null && range.from.dateHash < range.to.dateHash; })
       },
@@ -16828,13 +16853,13 @@
             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);
@@ -17509,8 +17534,8 @@
 
             this$1.timer = setTimeout(function () {
               el.style.height = (el.scrollHeight) + "px";
-              this$1.animListener = function (ev) {
-                if (Object(ev) !== ev || ev.target === el) {
+              this$1.animListener = function (evt) {
+                if (Object(evt) !== evt || evt.target === el) {
                   this$1.__end(el, 'show');
                 }
               };
@@ -17535,8 +17560,8 @@
 
             this$1.timer = setTimeout(function () {
               el.style.height = 0;
-              this$1.animListener = function (ev) {
-                if (Object(ev) !== ev || ev.target === el) {
+              this$1.animListener = function (evt) {
+                if (Object(evt) !== evt || evt.target === el) {
                   this$1.__end(el, 'hide');
                 }
               };
@@ -18095,7 +18120,7 @@
         var staticClass = "q-fab__" + kebab + " absolute-full";
 
         return slotFn === void 0
-          ? h(QIcon, { staticClass: staticClass, props: { name: this[kebab] || this.$q.iconSet.fab[camel] } })
+          ? h(QIcon, { staticClass: staticClass, props: { name: this[camel] || this.$q.iconSet.fab[camel] } })
           : h('div', { staticClass: staticClass }, slotFn(this.slotScope))
       }
     },
@@ -18809,14 +18834,6 @@
           }, this.__getControlContainer(h))
         );
 
-        this.$scopedSlots.append !== void 0 && node.push(
-          h('div', {
-            staticClass: 'q-field__append q-field__marginal row no-wrap items-center',
-            key: 'append',
-            on: this.slotsEvents
-          }, this.$scopedSlots.append())
-        );
-
         this.hasError === true && this.noErrorIcon === false && node.push(
           this.__getInnerAppendNode(h, 'error', [
             h(QIcon, { props: { name: this.$q.iconSet.field.error, color: 'negative' } })
@@ -18847,6 +18864,14 @@
           );
         }
 
+        this.$scopedSlots.append !== void 0 && node.push(
+          h('div', {
+            staticClass: 'q-field__append q-field__marginal row no-wrap items-center',
+            key: 'append',
+            on: this.slotsEvents
+          }, this.$scopedSlots.append())
+        );
+
         this.__getInnerAppend !== void 0 && node.push(
           this.__getInnerAppendNode(h, 'inner-append', this.__getInnerAppend(h))
         );
@@ -19062,10 +19087,16 @@
       this.__onPreRender !== void 0 && this.__onPreRender();
       this.__onPostRender !== void 0 && this.$nextTick(this.__onPostRender);
 
+      var attrs = this.__getControl === void 0 && this.$scopedSlots.control === void 0
+        ? Object.assign({}, this.qAttrs,
+          {'data-autofocus': this.autofocus},
+          this.attrs)
+        : this.attrs;
+
       return h('label', {
         staticClass: 'q-field q-validation-component row no-wrap items-start',
         class: this.classes,
-        attrs: this.attrs
+        attrs: attrs
       }, [
         this.$scopedSlots.before !== void 0 ? h('div', {
           staticClass: 'q-field__before q-field__marginal row no-wrap items-center',
@@ -19251,7 +19282,7 @@
         // Cordova/iOS allows selecting multiple files even when the
         // multiple attribute is not specified. We also normalize drag'n'dropped
         // files here:
-        if (this.multiple !== true) {
+        if (this.multiple !== true && files.length > 0) {
           files = [ files[0] ];
         }
 
@@ -19315,7 +19346,7 @@
 
       __onDragLeave: function __onDragLeave (e) {
         stopAndPrevent(e);
-        this.dnd = false;
+        e.relatedTarget !== this.$refs.dnd && (this.dnd = false);
       },
 
       __onDrop: function __onDrop (e) {
@@ -19333,6 +19364,7 @@
         if (this.dnd === true) {
           return h('div', {
             staticClass: ("q-" + type + "__dnd absolute-full"),
+            ref: 'dnd',
             on: cache(this, 'dnd', {
               dragenter: stopAndPreventDrag,
               dragover: stopAndPreventDrag,
@@ -19538,6 +19570,7 @@
         if (this.editable === true) {
           data.on = cache(this, 'native', {
             dragover: this.__onDragOver,
+            dragleave: this.__onDragLeave,
             keydown: this.__onKeydown,
             keyup: this.__onKeyup
           });
@@ -21488,7 +21521,10 @@
         if (this.hasMask === true) {
           if (this.stopValueWatcher === true) {
             this.stopValueWatcher = false;
-            return
+
+            if (String(v) === this.emitCachedValue) {
+              return
+            }
           }
 
           this.__updateMaskValue(v);
@@ -22221,11 +22257,14 @@
           angle = center.left < pos.left ? angle + 90 : 270 - angle;
         }
 
-        if (this.angle) {
+        if (this.$q.lang.rtl === true) {
+          angle = normalizeToInterval(-angle - this.angle, 0, 360);
+        }
+        else if (this.angle) {
           angle = normalizeToInterval(angle - this.angle, 0, 360);
         }
 
-        if (this.$q.lang.rtl === true) {
+        if (this.reverse === true) {
           angle = 360 - angle;
         }
 
@@ -26998,6 +27037,20 @@
 
       menu: function menu (show) {
         this.__updateMenu(show);
+      },
+
+      virtualScrollLength: function virtualScrollLength () {
+        var this$1 = this;
+
+        if (this.menu === true && this.innerLoading === false) {
+          this.reset();
+
+          this.$nextTick(function () {
+            if (this$1.menu === true && this$1.innerLoading === false) {
+              this$1.__updateMenu(true);
+            }
+          });
+        }
       }
     },
 
@@ -27448,9 +27501,7 @@
 
         return typeof val === 'function'
           ? val
-          : function (opt) { return Object(opt) === opt && val in opt
-            ? opt[val]
-            : opt; }
+          : function (opt) { return (opt !== null && typeof opt === 'object' && val in opt ? opt[ val ] : opt); }
       },
 
       isOptionSelected: function isOptionSelected (opt) {
@@ -27815,6 +27866,8 @@
         }
         // there can be only one (when dialog is opened the control in dialog should be target)
         else if (this.editable === true) {
+          var attrs$1 = isTarget === true ? this.comboboxAttrs : void 0;
+
           child.push(
             h('div', {
               ref: isTarget === true ? 'target' : void 0,
@@ -27822,7 +27875,7 @@
               staticClass: 'q-select__focus-target',
               attrs: Object.assign({}, {id: isTarget === true ? this.targetUid : void 0,
                 tabindex: this.tabindex},
-                this.comboboxAttrs),
+                attrs$1),
               on: cache(this, 'f-tget', {
                 keydown: this.__onTargetKeydown,
                 keyup: this.__onTargetKeyup,
@@ -27860,7 +27913,9 @@
           );
         }
 
-        return h('div', { staticClass: 'q-field__native row items-center', attrs: this.qAttrs }, child)
+        var attrs = this.useInput === true || isTarget !== true ? void 0 : this.qAttrs;
+
+        return h('div', { staticClass: 'q-field__native row items-center', attrs: attrs }, child)
       },
 
       __getOptions: function __getOptions (h) {
@@ -27927,6 +27982,8 @@
       },
 
       __getInput: function __getInput (h, fromDialog, isTarget) {
+        var attrs = isTarget === true ? Object.assign({}, this.comboboxAttrs, this.qAttrs) : void 0;
+
         var options = {
           ref: isTarget === true ? 'target' : void 0,
           key: 'i_t',
@@ -27935,15 +27992,14 @@
           class: this.computedInputClass,
           domProps: { value: this.inputValue !== void 0 ? this.inputValue : '' },
           attrs: Object.assign({}, {type: 'search'},
-            this.qAttrs,
+            attrs,
             {id: isTarget === true ? this.targetUid : void 0,
             maxlength: this.maxlength, // this is converted to prop by QField
             tabindex: this.tabindex,
             autocomplete: this.autocomplete,
             'data-autofocus': fromDialog === true ? false : this.autofocus,
             disabled: this.disable === true,
-            readonly: this.readonly === true},
-            this.comboboxAttrs),
+            readonly: this.readonly === true}),
           on: this.inputControlEvents
         };
 
@@ -31307,23 +31363,36 @@
 
       hasPrefix: function hasPrefix () {
         return this.step.prefix &&
-          this.isActive === false &&
-          this.isError === false &&
-          this.isDone === false
+          (this.isActive === false || this.stepper.activeIcon === 'none') &&
+          (this.isError === false || this.stepper.errorIcon === 'none') &&
+          (this.isDone === false || this.stepper.doneIcon === 'none')
       },
 
       icon: function icon () {
+        var defaultIcon = this.step.icon || this.stepper.inactiveIcon;
+
         if (this.isActive === true) {
-          return this.step.activeIcon || this.stepper.activeIcon || this.$q.iconSet.stepper.active
+          var icon = this.step.activeIcon || this.stepper.activeIcon;
+          return icon === 'none'
+            ? defaultIcon
+            : icon || this.$q.iconSet.stepper.active
         }
+
         if (this.isError === true) {
-          return this.step.errorIcon || this.stepper.errorIcon || this.$q.iconSet.stepper.error
+          var icon$1 = this.step.errorIcon || this.stepper.errorIcon;
+          return icon$1 === 'none'
+            ? defaultIcon
+            : icon$1 || this.$q.iconSet.stepper.error
         }
+
         if (this.isDisable === false && this.isDone === true) {
-          return this.step.doneIcon || this.stepper.doneIcon || this.$q.iconSet.stepper.done
+          var icon$2 = this.step.doneIcon || this.stepper.doneIcon;
+          return icon$2 === 'none'
+            ? defaultIcon
+            : icon$2 || this.$q.iconSet.stepper.done
         }
 
-        return this.step.icon || this.stepper.inactiveIcon
+        return defaultIcon
       },
 
       color: function color () {
@@ -31350,7 +31419,9 @@
       classes: function classes () {
         return "q-stepper__tab col-grow flex items-center no-wrap relative-position" +
           (this.color !== void 0 ? (" text-" + (this.color)) : '') +
-          (this.isError === true ? ' q-stepper__tab--error' : '') +
+          (this.isError === true
+            ? ' q-stepper__tab--error q-stepper__tab--error-with-' + (this.hasPrefix === true ? 'prefix' : 'icon')
+            : '') +
           (this.isActive === true ? ' q-stepper__tab--active' : '') +
           (this.isDone === true ? ' q-stepper__tab--done' : '') +
           (this.headerNav === true ? ' q-stepper__tab--navigation q-focusable q-hoverable' : '') +
@@ -32644,7 +32715,7 @@
       sort: function sort (col /* String(col name) or Object(col definition) */) {
         var sortOrder = this.columnSortOrder;
 
-        if (col === Object(col)) {
+        if (isObject(col) === true) {
           if (col.sortOrder) {
             sortOrder = col.sortOrder;
           }
@@ -35999,7 +36070,10 @@
           'disabled q-uploader--disable': this.disable
         },
         on: this.canAddFiles === true
-          ? cache(this, 'drag', { dragover: this.__onDragOver })
+          ? cache(this, 'drag', {
+            dragover: this.__onDragOver,
+            dragleave: this.__onDragLeave
+          })
           : null
       }, children)
     }
@@ -37043,7 +37117,7 @@
         if (typeof options.style === 'string') {
           elTo.style.cssText += ' ' + options.style;
         }
-        else if (options.style === Object(options.style)) {
+        else if (isObject(options.style) === true) {
           for (var prop in options.style) {
             elTo.style[prop] = options.style[prop];
           }
@@ -37362,8 +37436,8 @@
           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;
 
-          var cleanup$1 = function (ev) {
-            if (ev === Object(ev) && ev.animationName !== qAnimId) {
+          var cleanup$1 = function (evt) {
+            if (evt === Object(evt) && evt.animationName !== qAnimId) {
               return
             }
 
@@ -39188,7 +39262,7 @@
 
       spinner: function spinner () {
         if (this.progress !== false) {
-          return Object(this.progress) === this.progress
+          return isObject(this.progress) === true
             ? {
               component: this.progress.spinner || QSpinner,
               props: { color: this.progress.color || this.vmColor }
@@ -39205,7 +39279,7 @@
       },
 
       okLabel: function okLabel () {
-        return Object(this.ok) === this.ok
+        return isObject(this.ok) === true
           ? this.$q.lang.label.ok
           : (
             this.ok === true
@@ -39215,7 +39289,7 @@
       },
 
       cancelLabel: function cancelLabel () {
-        return Object(this.cancel) === this.cancel
+        return isObject(this.cancel) === true
           ? this.$q.lang.label.cancel
           : (
             this.cancel === true
@@ -39244,14 +39318,14 @@
           label: this.okLabel,
           ripple: false,
           disable: this.okDisabled},
-          (Object(this.ok) === this.ok ? this.ok : { flat: true }))
+          (isObject(this.ok) === true ? this.ok : { flat: true }))
       },
 
       cancelProps: function cancelProps () {
         return Object.assign({}, {color: this.vmColor,
           label: this.cancelLabel,
           ripple: false},
-          (Object(this.cancel) === this.cancel ? this.cancel : { flat: true }))
+          (isObject(this.cancel) === true ? this.cancel : { flat: true }))
       }
     },
 
@@ -39478,6 +39552,15 @@
       var props = cfg.loadingBar !== void 0
         ? Object.assign({}, cfg.loadingBar)
         : {};
+      var on = {
+        start: function () {
+          this$1.isActive = true;
+        },
+
+        stop: function () {
+          this$1.isActive = false;
+        }
+      };
 
       var bar = new Vue({
         name: 'LoadingBar',
@@ -39492,22 +39575,17 @@
 
         render: function (h) { return h(QAjaxBar, {
           ref: 'bar',
-          props: props
+          props: props,
+          on: on
         }); }
       }).$mount().$refs.bar;
 
       Object.assign(this, {
-        start: function (speed) {
-          bar.start(speed);
-          this$1.isActive = bar.isActive = true;
-        },
-        stop: function () {
-          var sessions = bar.stop();
-          this$1.isActive = bar.isActive = sessions > 0;
-        },
+        start: bar.start,
+        stop: bar.stop,
         increment: bar.increment,
         setDefaults: function (opts) {
-          opts === Object(opts) && Object.assign(props, opts);
+          isObject(opts) === true && Object.assign(props, opts);
           bar.$parent.$forceUpdate();
         }
       });
@@ -39546,7 +39624,7 @@
 
       if (isSSR === true) { return }
 
-      props$1 = opts === Object(opts) && opts.ignoreDefaults === true
+      props$1 = isObject(opts) === true && opts.ignoreDefaults === true
         ? Object.assign({}, originalDefaults, opts)
         : Object.assign({}, defaults, opts);
 
@@ -39642,7 +39720,7 @@
     },
 
     setDefaults: function setDefaults (opts) {
-      opts === Object(opts) && Object.assign(defaults, opts);
+      isObject(opts) === true && Object.assign(defaults, opts);
     },
 
     install: function install (ref) {
@@ -40037,7 +40115,7 @@
       Object.assign(notif, defaults$1);
     }
 
-    if (Object(config) !== config) {
+    if (isObject(config) === false) {
       if (notif.type) {
         Object.assign(notif, notifTypes[notif.type]);
       }
@@ -40387,7 +40465,8 @@
             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 }
                 })
               );
             }
@@ -40396,7 +40475,7 @@
                 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 }
                 })
               );
             }
@@ -40500,13 +40579,13 @@
 
   var Notify = {
     setDefaults: function setDefaults (opts) {
-      if (isSSR !== true && opts === Object(opts)) {
+      if (isSSR !== true && isObject(opts) === true) {
         Object.assign(defaults$1, opts);
       }
     },
 
     registerType: function registerType (typeName, typeOpts) {
-      if (isSSR !== true && typeOpts === Object(typeOpts)) {
+      if (isSSR !== true && isObject(typeOpts) === true) {
         notifTypes[typeName] = typeOpts;
       }
     },
@@ -40547,10 +40626,10 @@
   };
 
   function encode$1 (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') {