quasar 2.5.0 → 2.5.4

package/dist/quasar.umd.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.5.0
+ * Quasar Framework v2.5.4
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -635,11 +635,15 @@
 
       const { visualViewport } = window;
       const target = visualViewport || window;
-      const getSize = visualViewport === void 0
-        ? () => [ window.innerWidth, window.innerHeight ]
+      const scrollingElement = document.scrollingElement || document.documentElement;
+      const getSize = visualViewport === void 0 || client.is.mobile === true
+        ? () => [
+            Math.max(window.innerWidth, scrollingElement.clientWidth),
+            Math.max(window.innerHeight, scrollingElement.clientHeight)
+          ]
         : () => [
-            visualViewport.width * visualViewport.scale + window.innerWidth - document.scrollingElement.clientWidth,
-            visualViewport.height * visualViewport.scale + window.innerHeight - document.scrollingElement.clientHeight
+            visualViewport.width * visualViewport.scale + window.innerWidth - scrollingElement.clientWidth,
+            visualViewport.height * visualViewport.scale + window.innerHeight - scrollingElement.clientHeight
           ];
 
       const classes = $q.config.screen !== void 0 && $q.config.screen.bodyClasses === true;
@@ -1459,7 +1463,7 @@
   }
 
   var installQuasar = function (parentApp, opts = {}) {
-      const $q = { version: '2.5.0' };
+      const $q = { version: '2.5.4' };
 
       if (globalConfigIsFrozen === false) {
         if (opts.config !== void 0) {
@@ -2700,7 +2704,7 @@
       prevent(e);
 
       return proxy.$router[ props.replace === true ? 'replace' : 'push' ](props.to)
-        .catch(() => {})
+        .catch(err => err)
     }
 
     return {
@@ -9907,9 +9911,12 @@
                 $tabs.avoidRouteWatcher = false;
               }
               else {
-                res.then(() => {
+                res.then(err => {
                   $tabs.avoidRouteWatcher = false;
-                  $tabs.updateModel({ name: props.name, fromRoute: true });
+
+                  if (err === void 0) {
+                    $tabs.updateModel({ name: props.name, fromRoute: true });
+                  }
                 });
               }
             };
@@ -9966,12 +9973,12 @@
       props.alert !== false && content.push(
         props.alertIcon !== void 0
           ? vue.h(QIcon, {
-              class: 'q-tab__alert-icon',
-              color: props.alert !== true
-                ? props.alert
-                : void 0,
-              name: props.alertIcon
-            })
+            class: 'q-tab__alert-icon',
+            color: props.alert !== true
+              ? props.alert
+              : void 0,
+            name: props.alertIcon
+          })
           : vue.h('div', {
             class: 'q-tab__alert'
               + (props.alert !== true ? ` text-${ props.alert }` : '')
@@ -11779,15 +11786,18 @@
   function applyYearMonthDayChange (date, mod, sign) {
     let
       year = date.getFullYear(),
-      month = date.getMonth(),
-      day = date.getDate();
+      month = date.getMonth();
 
-    if (mod.years !== void 0) {
-      year += sign * mod.years;
+    const day = date.getDate();
+
+    if (mod.year !== void 0) {
+      year += sign * mod.year;
+      delete mod.year;
     }
 
-    if (mod.months !== void 0) {
-      month += sign * mod.months;
+    if (mod.month !== void 0) {
+      month += sign * mod.month;
+      delete mod.month;
     }
 
     date.setDate(1);
@@ -11797,30 +11807,14 @@
     date.setMonth(month);
     date.setDate(Math.min(day, daysInMonth(date)));
 
-    if (mod.days !== void 0) {
-      date.setDate(date.getDate() + sign * mod.days);
+    if (mod.date !== void 0) {
+      date.setDate(date.getDate() + sign * mod.date);
+      delete mod.date;
     }
 
     return date
   }
 
-  function getChange (date, mod, sign) {
-    const
-      d = new Date(date),
-      t = mod.years !== void 0 || mod.months !== void 0 || mod.days !== void 0
-        ? applyYearMonthDayChange(d, mod, sign)
-        : d;
-
-    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
-  }
-
   function applyYearMonthDay (date, mod, middle) {
     const
       year = mod.year !== void 0 ? mod.year : date[ `get${ middle }FullYear` ](),
@@ -11835,22 +11829,86 @@
     date[ `set${ middle }Month` ](month);
     date[ `set${ middle }Date` ](day);
 
+    delete mod.year;
+    delete mod.month;
+    delete mod.date;
+
     return date
   }
 
-  function adjustDate (date, mod, utc) {
+  function getChange (date, rawMod, sign) {
     const
+      mod = normalizeMod(rawMod),
+      d = new Date(date),
+      t = mod.year !== void 0 || mod.month !== void 0 || mod.date !== void 0
+        ? applyYearMonthDayChange(d, mod, sign) // removes year/month/day
+        : d;
+
+    for (const key in mod) {
+      const op = capitalize(key);
+      t[ `set${ op }` ](t[ `get${ op }` ]() + sign * mod[ key ]);
+    }
+
+    return t
+  }
+
+  function normalizeMod (mod) {
+    const acc = { ...mod };
+
+    if (mod.years !== void 0) {
+      acc.year = mod.years;
+      delete acc.years;
+    }
+
+    if (mod.months !== void 0) {
+      acc.month = mod.months;
+      delete acc.months;
+    }
+
+    if (mod.days !== void 0) {
+      acc.date = mod.days;
+      delete acc.days;
+    }
+    if (mod.day !== void 0) {
+      acc.date = mod.day;
+      delete acc.day;
+    }
+
+    if (mod.hour !== void 0) {
+      acc.hours = mod.hour;
+      delete acc.hour;
+    }
+
+    if (mod.minute !== void 0) {
+      acc.minutes = mod.minute;
+      delete acc.minute;
+    }
+
+    if (mod.second !== void 0) {
+      acc.seconds = mod.second;
+      delete acc.second;
+    }
+
+    if (mod.millisecond !== void 0) {
+      acc.milliseconds = mod.millisecond;
+      delete acc.millisecond;
+    }
+
+    return acc
+  }
+
+  function adjustDate (date, rawMod, utc) {
+    const
+      mod = normalizeMod(rawMod),
       middle = utc === true ? 'UTC' : '',
       d = new Date(date),
       t = mod.year !== void 0 || mod.month !== void 0 || mod.date !== void 0
-        ? applyYearMonthDay(d, mod, middle)
+        ? applyYearMonthDay(d, mod, middle) // removes year/month/day
         : d;
 
     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 ]);
-      }
+      const op = key.charAt(0).toUpperCase() + key.slice(1);
+      t[ `set${ middle }${ op }` ](mod[ key ]);
     }
 
     return t
@@ -12084,16 +12142,23 @@
 
     switch (unit) {
       case 'year':
+      case 'years':
         t[ `${ prefix }Month` ](0);
       case 'month':
+      case 'months':
         t[ `${ prefix }Date` ](1);
       case 'day':
+      case 'days':
+      case 'date':
         t[ `${ prefix }Hours` ](0);
       case 'hour':
+      case 'hours':
         t[ `${ prefix }Minutes` ](0);
       case 'minute':
+      case 'minutes':
         t[ `${ prefix }Seconds` ](0);
       case 'second':
+      case 'seconds':
         t[ `${ prefix }Milliseconds` ](0);
     }
     return t
@@ -12106,16 +12171,23 @@
 
     switch (unit) {
       case 'year':
+      case 'years':
         t[ `${ prefix }Month` ](11);
       case 'month':
+      case 'months':
         t[ `${ prefix }Date` ](daysInMonth(t));
       case 'day':
+      case 'days':
+      case 'date':
         t[ `${ prefix }Hours` ](23);
       case 'hour':
+      case 'hours':
         t[ `${ prefix }Minutes` ](59);
       case 'minute':
+      case 'minutes':
         t[ `${ prefix }Seconds` ](59);
       case 'second':
+      case 'seconds':
         t[ `${ prefix }Milliseconds` ](999);
     }
     return t
@@ -12151,21 +12223,28 @@
 
     switch (unit) {
       case 'years':
+      case 'year':
         return (t.getFullYear() - sub.getFullYear())
 
       case 'months':
+      case 'month':
         return (t.getFullYear() - sub.getFullYear()) * 12 + t.getMonth() - sub.getMonth()
 
       case 'days':
+      case 'day':
+      case 'date':
         return getDiff(startOfDate(t, 'day'), startOfDate(sub, 'day'), MILLISECONDS_IN_DAY)
 
       case 'hours':
+      case 'hour':
         return getDiff(startOfDate(t, 'hour'), startOfDate(sub, 'hour'), MILLISECONDS_IN_HOUR)
 
       case 'minutes':
+      case 'minute':
         return getDiff(startOfDate(t, 'minute'), startOfDate(sub, 'minute'), MILLISECONDS_IN_MINUTE)
 
       case 'seconds':
+      case 'second':
         return getDiff(startOfDate(t, 'second'), startOfDate(sub, 'second'), 1000)
     }
   }
@@ -12211,26 +12290,33 @@
 
     switch (unit) {
       case 'second':
+      case 'seconds':
         if (t.getSeconds() !== d.getSeconds()) {
           return false
         }
       case 'minute': // intentional fall-through
+      case 'minutes':
         if (t.getMinutes() !== d.getMinutes()) {
           return false
         }
       case 'hour': // intentional fall-through
+      case 'hours':
         if (t.getHours() !== d.getHours()) {
           return false
         }
       case 'day': // intentional fall-through
+      case 'days':
+      case 'date':
         if (t.getDate() !== d.getDate()) {
           return false
         }
       case 'month': // intentional fall-through
+      case 'months':
         if (t.getMonth() !== d.getMonth()) {
           return false
         }
       case 'year': // intentional fall-through
+      case 'years':
         if (t.getFullYear() !== d.getFullYear()) {
           return false
         }
@@ -20307,7 +20393,14 @@
       else if (isDirtyModel.value === false) {
         isDirtyModel.value = true;
 
-        if (hasActiveRules.value === true && props.lazyRules !== 'ondemand') {
+        if (
+          hasActiveRules.value === true
+          && props.lazyRules !== 'ondemand'
+          // Don't re-trigger if it's already in progress;
+          // It might mean that focus switched to submit btn and
+          // QForm's submit() has been called already (ENTER key)
+          && innerLoading.value === false
+        ) {
           debouncedValidate();
         }
       }
@@ -20333,7 +20426,7 @@
         return true
       }
 
-      validateIndex++;
+      const index = ++validateIndex;
 
       if (innerLoading.value !== true && props.lazyRules !== true) {
         isDirtyModel.value = true;
@@ -20350,9 +20443,7 @@
           innerErrorMessage.value = m;
         }
 
-        if (innerLoading.value !== false) {
-          innerLoading.value = false;
-        }
+        innerLoading.value = false;
       };
 
       const promises = [];
@@ -20382,35 +20473,26 @@
         return true
       }
 
-      if (innerLoading.value !== true) {
-        innerLoading.value = true;
-      }
-
-      const index = validateIndex;
+      innerLoading.value = true;
 
       return Promise.all(promises).then(
         res => {
-          if (index !== validateIndex) {
-            return true
-          }
-
           if (res === void 0 || Array.isArray(res) === false || res.length === 0) {
-            update(false);
+            index === validateIndex && update(false);
             return true
           }
 
           const msg = res.find(r => r === false || typeof r === 'string');
-          update(msg !== void 0, msg);
+          index === validateIndex && update(msg !== void 0, msg);
           return msg === void 0
         },
         e => {
           if (index === validateIndex) {
             console.error(e);
             update(true);
-            return false
           }
 
-          return true
+          return false
         }
       )
     }
@@ -21570,7 +21652,7 @@
           ? shouldFocus
           : props.noErrorFocus !== true;
 
-        validateIndex++;
+        const index = ++validateIndex;
 
         const emitEvent = (res, ref) => {
           emit('validation-' + (res === true ? 'success' : 'error'), ref);
@@ -21584,7 +21666,7 @@
             promises.push(
               valid.then(
                 valid => ({ valid, comp }),
-                error => ({ valid: false, comp, error })
+                err => ({ valid: false, comp, err })
               )
             );
           }
@@ -21608,34 +21690,33 @@
           return Promise.resolve(true)
         }
 
-        const index = validateIndex;
-
-        return Promise.all(promises).then(
-          res => {
-            if (index === validateIndex) {
-              const errors = res.filter(r => r.valid !== true);
+        return Promise.all(promises).then(res => {
+          const errors = res.filter(r => r.valid !== true);
 
-              if (errors.length === 0) {
-                emitEvent(true);
-                return true
-              }
+          if (errors.length === 0) {
+            index === validateIndex && emitEvent(true);
+            return true
+          }
 
-              const { valid, comp } = errors[ 0 ];
+          const { valid, comp, err } = errors[ 0 ];
 
-              emitEvent(false, comp);
+          // if not outdated already
+          if (index === validateIndex) {
+            err !== void 0 && console.error(err);
 
-              if (
-                focus === true
-                && valid !== true
-                && typeof comp.focus === 'function'
-              ) {
-                comp.focus();
-              }
+            emitEvent(false, comp);
 
-              return false
+            if (
+              focus === true
+              && valid !== true
+              && typeof comp.focus === 'function'
+            ) {
+              comp.focus();
             }
           }
-        )
+
+          return false
+        })
       }
 
       function resetValidation () {
@@ -21649,8 +21730,11 @@
       function submit (evt) {
         evt !== void 0 && stopAndPrevent(evt);
 
+        const index = validateIndex + 1;
+
         validate().then(val => {
-          if (val === true) {
+          // if not outdated && validation succeeded
+          if (index === validateIndex && val === true) {
             if (props.onSubmit !== void 0) {
               emit('submit', evt);
             }
@@ -22826,7 +22910,7 @@
         ? unmaskValue(masked)
         : masked;
 
-      props.modelValue !== val && emitValue(val, true);
+      String(props.modelValue) !== val && emitValue(val, true);
     }
 
     function moveCursorForPaste (inp, start, end) {
@@ -23721,6 +23805,9 @@
         required: true
       },
 
+      innerMin: Number,
+      innerMax: Number,
+
       step: {
         type: Number,
         default: 1,
@@ -23745,27 +23832,33 @@
       const model = vue.ref(props.modelValue);
       const dragging = vue.ref(false);
 
-      let centerPosition, $el;
+      const innerMin = vue.computed(() => (
+        isNaN(props.innerMin) === true || props.innerMin < props.min
+          ? props.min
+          : props.innerMin
+      ));
+      const innerMax = vue.computed(() => (
+        isNaN(props.innerMax) === true || props.innerMax > props.max
+          ? props.max
+          : props.innerMax
+      ));
 
-      vue.watch(() => props.modelValue, val => {
-        if (val < props.min) {
-          model.value = props.min;
-        }
-        else if (val > props.max) {
-          model.value = props.max;
-        }
-        else {
-          if (val !== model.value) {
-            model.value = val;
-          }
-          return
-        }
+      let centerPosition;
 
-        if (model.value !== props.modelValue) {
-          emit('update:modelValue', model.value);
-          emit('change', model.value);
-        }
-      });
+      function normalizeModel () {
+        model.value = props.modelValue === null
+          ? innerMin.value
+          : between(props.modelValue, innerMin.value, innerMax.value);
+
+        updateValue(true);
+      }
+
+      vue.watch(
+        () => `${ props.modelValue }|${ innerMin.value }|${ innerMax.value }`,
+        normalizeModel
+      );
+
+      normalizeModel();
 
       const editable = vue.computed(() => props.disable === false && props.readonly === false);
 
@@ -23833,7 +23926,7 @@
       });
 
       function updateCenterPosition () {
-        const { top, left, width, height } = $el.getBoundingClientRect();
+        const { top, left, width, height } = proxy.$el.getBoundingClientRect();
         centerPosition = {
           top: top + height / 2,
           left: left + width / 2
@@ -23863,8 +23956,8 @@
 
         model.value = between(
           parseFloat((model.value + offset).toFixed(decimals.value)),
-          props.min,
-          props.max
+          innerMin.value,
+          innerMax.value
         );
 
         updateValue();
@@ -23907,7 +24000,7 @@
           newModel = parseFloat(newModel.toFixed(decimals.value));
         }
 
-        newModel = between(newModel, props.min, props.max);
+        newModel = between(newModel, innerMin.value, innerMax.value);
 
         emit('drag-value', newModel);
 
@@ -23935,16 +24028,12 @@
         return vue.h('input', formAttrs.value)
       }
 
-      vue.onMounted(() => {
-        $el = proxy.$el;
-      });
-
       return () => {
         const data = {
           class: classes.value,
           role: 'slider',
-          'aria-valuemin': props.min,
-          'aria-valuemax': props.max,
+          'aria-valuemin': innerMin.value,
+          'aria-valuemax': innerMax.value,
           'aria-valuenow': props.modelValue,
           ...attrs.value,
           ...circularProps.value,
@@ -23957,18 +24046,18 @@
           default: slots.default
         };
 
-        if (editable.value === true) {
-          if (props.name !== void 0) {
-            child.internal = getNameInput;
-          }
-
-          return vue.withDirectives(
-            vue.h(QCircularProgress, data, child),
-            directives.value
-          )
+        if (editable.value === true && props.name !== void 0) {
+          child.internal = getNameInput;
         }
 
-        return vue.h(QCircularProgress, data, child)
+        return hDir(
+          QCircularProgress,
+          data,
+          child,
+          'knob',
+          editable.value,
+          () => directives.value
+        )
       }
     }
   });
@@ -28370,7 +28459,7 @@
             itemProps[ 'aria-selected' ] = itemProps.active === true ? 'true' : 'false';
 
             if ($q.platform.is.desktop === true) {
-              itemProps.onMousemove = () => { setOptionIndex(index); };
+              itemProps.onMousemove = () => { menu.value === true && setOptionIndex(index); };
             }
           }
 
@@ -29418,6 +29507,7 @@
       Object.assign(proxy, {
         showPopup, hidePopup,
         removeAtIndex, add, toggleOption,
+        getOptionIndex: () => optionIndex.value,
         setOptionIndex, moveOptionSelection,
         filter, updateMenuPosition, updateInputValue,
         isOptionSelected,
@@ -35976,34 +36066,34 @@
 
             m.lazy === 'loading'
               ? vue.h(QSpinner, {
-                  class: 'q-tree__spinner',
-                  color: computedControlColor.value
-                })
+                class: 'q-tree__spinner',
+                color: computedControlColor.value
+              })
               : (
                   isParent === true
                     ? vue.h(QIcon, {
-                        class: 'q-tree__arrow'
+                      class: 'q-tree__arrow'
                       + (m.expanded === true ? ' q-tree__arrow--rotate' : ''),
-                        name: computedIcon.value,
-                        onClick (e) { onExpandClick(node, m, e); }
-                      })
+                      name: computedIcon.value,
+                      onClick (e) { onExpandClick(node, m, e); }
+                    })
                     : null
                 ),
 
             m.hasTicking === true && m.noTick !== true
               ? vue.h(QCheckbox, {
-                  class: 'q-tree__tickbox',
-                  modelValue: m.indeterminate === true ? null : m.ticked,
-                  color: computedControlColor.value,
-                  dark: isDark.value,
-                  dense: true,
-                  keepColor: true,
-                  disable: m.tickable !== true,
-                  onKeydown: stopAndPrevent,
-                  'onUpdate:modelValue': v => {
-                    onTickedClick(m, v);
-                  }
-                })
+                class: 'q-tree__tickbox',
+                modelValue: m.indeterminate === true ? null : m.ticked,
+                color: computedControlColor.value,
+                dark: isDark.value,
+                dense: true,
+                keepColor: true,
+                disable: m.tickable !== true,
+                onKeydown: stopAndPrevent,
+                'onUpdate:modelValue': v => {
+                  onTickedClick(m, v);
+                }
+              })
               : null,
 
             vue.h('div', {
@@ -36021,22 +36111,22 @@
 
           isParent === true
             ? vue.h(QSlideTransition, {
-                duration: props.duration,
-                onShow,
-                onHide
-              }, () => vue.withDirectives(
+              duration: props.duration,
+              onShow,
+              onHide
+            }, () => vue.withDirectives(
+              vue.h('div', {
+                class: 'q-tree__node-collapsible' + textColorClass.value,
+                key: `${ key }__q`
+              }, [
+                body,
                 vue.h('div', {
-                  class: 'q-tree__node-collapsible' + textColorClass.value,
-                  key: `${ key }__q`
-                }, [
-                  body,
-                  vue.h('div', {
-                    class: 'q-tree__children'
+                  class: 'q-tree__children'
                     + (m.disabled === true ? ' q-tree__node--disabled' : '')
-                  }, children)
-                ]),
-                [ [ vue.vShow, m.expanded ] ]
-              ))
+                }, children)
+              ]),
+              [ [ vue.vShow, m.expanded ] ]
+            ))
             : body
         ])
       }
@@ -36049,14 +36139,12 @@
       function onClick (node, meta, e, keyboard) {
         keyboard !== true && blur(meta.key);
 
-        if (hasSelection.value) {
-          if (meta.selectable) {
-            if (props.noSelectionUnset === false) {
-              emit('update:selected', meta.key !== props.selected ? meta.key : null);
-            }
-            else if (meta.key !== props.selected) {
-              emit('update:selected', meta.key || null);
-            }
+        if (hasSelection.value && meta.selectable) {
+          if (props.noSelectionUnset === false) {
+            emit('update:selected', meta.key !== props.selected ? meta.key : null);
+          }
+          else if (meta.key !== props.selected) {
+            emit('update:selected', meta.key || null);
           }
         }
         else {
@@ -39439,7 +39527,7 @@
   });
 
   var index_umd = {
-    version: '2.5.0',
+    version: '2.5.4',
     install (app, opts) {
       installQuasar(app, {
         components,