quasar 2.14.2 → 2.14.4

package/src/composables/private/use-validate.js

@@ -31,7 +31,7 @@ export default function (focused, innerLoading) {
 
   const innerError = ref(false)
   const innerErrorMessage = ref(null)
-  const isDirtyModel = ref(null)
+  const isDirtyModel = ref(false)
 
   useFormChild({ validate, resetValidation })
 
@@ -74,18 +74,20 @@ export default function (focused, innerLoading) {
     }
   })
 
+  function onRulesChange () {
+    if (
+      props.lazyRules !== 'ondemand'
+      && canDebounceValidate.value === true
+      && isDirtyModel.value === true
+    ) {
+      debouncedValidate()
+    }
+  }
+
   watch(() => props.reactiveRules, val => {
     if (val === true) {
       if (unwatchRules === void 0) {
-        unwatchRules = watch(() => props.rules, () => {
-          if (
-            canDebounceValidate.value === true
-            && isDirtyModel.value === true
-            && props.lazyRules !== 'ondemand'
-          ) {
-            debouncedValidate()
-          }
-        }, { immediate: true })
+        unwatchRules = watch(() => props.rules, onRulesChange, { immediate: true, deep: true })
       }
     }
     else if (unwatchRules !== void 0) {
@@ -94,30 +96,15 @@ export default function (focused, innerLoading) {
     }
   }, { immediate: true })
 
-  watch(() => props.lazyRules, val => {
-    if (
-      val === false
-      && canDebounceValidate.value === true
-      && isDirtyModel.value === true
-    ) {
-      debouncedValidate()
-    }
-  })
+  watch(() => props.lazyRules, onRulesChange)
 
   watch(focused, val => {
     if (val === true) {
-      if (isDirtyModel.value === null) {
-        isDirtyModel.value = props.lazyRules === true
-      }
+      isDirtyModel.value = true
     }
     else if (
       canDebounceValidate.value === true
-      && (
-        // props.lazyRules can also be 'ondemand',
-        // hence the following form:
-        props.lazyRules === false
-        || (props.lazyRules === true && isDirtyModel.value === true)
-      )
+      && props.lazyRules !== 'ondemand'
     ) {
       debouncedValidate()
     }
@@ -126,7 +113,7 @@ export default function (focused, innerLoading) {
   function resetValidation () {
     validateIndex++
     innerLoading.value = false
-    isDirtyModel.value = null
+    isDirtyModel.value = false
     innerError.value = false
     innerErrorMessage.value = null
     debouncedValidate.cancel()

package/src/directives/Morph.json

@@ -102,7 +102,7 @@
 
       "waitFor": {
         "type": [ "Number", "String", "Promise<void>" ],
-        "desc": "Delay animation start for that number of milliseconds, or until a 'transitionend' event is emitted by the destination element, or until the promise is resolved (if the promise is rejected the morphing will abort, but the `toggle function` was already called)",
+        "desc": "Delay animation start for that number of milliseconds, or until a 'transitionend' event is emitted by the destination element, or until the promise is resolved (if the promise is rejected the morphing will abort, but the 'toggle function' was already called)",
         "default": "0",
         "examples": [ "300", "transitionend" ]
       },

package/src/plugins/Dark.js

@@ -1,5 +1,4 @@
 import defineReactivePlugin from '../utils/private/define-reactive-plugin.js'
-import { isRuntimeSsrPreHydration } from './Platform.js'
 
 const Plugin = defineReactivePlugin({
   isActive: false,
@@ -38,7 +37,7 @@ const Plugin = defineReactivePlugin({
     }
   },
 
-  install ({ $q, onSSRHydrated, ssrContext }) {
+  install ({ $q, ssrContext }) {
     const { dark } = $q.config
 
     if (__QUASAR_SSR_SERVER__) {
@@ -66,31 +65,8 @@ const Plugin = defineReactivePlugin({
 
     $q.dark = this
 
-    if (this.__installed === true && dark === void 0) {
-      return
-    }
-
-    this.isActive = dark === true
-
-    const initialVal = dark !== void 0 ? dark : false
-
-    if (isRuntimeSsrPreHydration.value === true) {
-      const ssrSet = val => {
-        this.__fromSSR = val
-      }
-
-      const originalSet = this.set
-
-      this.set = ssrSet
-      ssrSet(initialVal)
-
-      onSSRHydrated.push(() => {
-        this.set = originalSet
-        this.set(this.__fromSSR)
-      })
-    }
-    else {
-      this.set(initialVal)
+    if (this.__installed !== true) {
+      this.set(dark !== void 0 ? dark : false)
     }
   }
 })

package/src/utils/copy-to-clipboard.js

@@ -1,4 +1,3 @@
-
 import { addFocusout, removeFocusout } from './private/focusout.js'
 
 function fallback (text) {

package/src/utils/get-css-var.js

@@ -1,4 +1,3 @@
-
 export default function getCssVar (propName, element = document.body) {
   if (typeof propName !== 'string') {
     throw new TypeError('Expected a string as propName')

package/src/utils/is.js

@@ -1,4 +1,3 @@
-
 export function isDeepEqual (a, b) {
   if (a === b) {
     return true

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

@@ -1,4 +1,3 @@
-
 import { reactive } from 'vue'
 import { injectProp } from './inject-obj-prop.js'
 

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

@@ -1,4 +1,3 @@
-
 export const globalConfig = {}
 export let globalConfigIsFrozen = false
 

package/src/utils/private/touch.js

@@ -1,4 +1,3 @@
-
 const modifiersAll = {
   left: true,
   right: true,

package/src/utils/private/vm.js

@@ -1,4 +1,3 @@
-
 // copied to docs too
 export function getParentProxy (proxy) {
   if (Object(proxy.$parent) === proxy.$parent) {

package/src/utils/run-sequential-promises.js

@@ -1,4 +1,3 @@
-
 function parsePromises (sequentialPromises) {
   const isList = Array.isArray(sequentialPromises)