quasar 2.11.4 → 2.11.6

package/src/utils/is.js

@@ -32,20 +32,23 @@ export function isDeepEqual (a, b) {
         return false
       }
 
-      i = a.entries().next()
+      let iter = a.entries()
+
+      i = iter.next()
       while (i.done !== true) {
         if (b.has(i.value[ 0 ]) !== true) {
           return false
         }
-        i = i.next()
+        i = iter.next()
       }
 
-      i = a.entries().next()
+      iter = a.entries()
+      i = iter.next()
       while (i.done !== true) {
         if (isDeepEqual(i.value[ 1 ], b.get(i.value[ 0 ])) !== true) {
           return false
         }
-        i = i.next()
+        i = iter.next()
       }
 
       return true
@@ -56,12 +59,14 @@ export function isDeepEqual (a, b) {
         return false
       }
 
-      i = a.entries().next()
+      const iter = a.entries()
+
+      i = iter.next()
       while (i.done !== true) {
         if (b.has(i.value[ 0 ]) !== true) {
           return false
         }
-        i = i.next()
+        i = iter.next()
       }
 
       return true

package/src/utils/prevent-scroll.js

@@ -10,6 +10,7 @@ let
   vpPendingUpdate = false,
   bodyLeft,
   bodyTop,
+  href,
   closeTimer = null
 
 function onWheel (e) {
@@ -96,6 +97,8 @@ function apply (action) {
     bodyLeft = body.style.left
     bodyTop = body.style.top
 
+    href = window.location.href
+
     body.style.left = `-${ scrollPositionX }px`
     body.style.top = `-${ scrollPositionY }px`
 
@@ -108,6 +111,7 @@ function apply (action) {
 
     body.classList.add('q-body--prevent-scroll')
     document.qScrollPrevented = true
+
     if (client.is.ios === true) {
       if (hasViewport === true) {
         window.scrollTo(0, 0)
@@ -146,7 +150,11 @@ function apply (action) {
     body.style.left = bodyLeft
     body.style.top = bodyTop
 
-    window.scrollTo(scrollPositionX, scrollPositionY)
+    // scroll back only if route has not changed
+    if (window.location.href === href) {
+      window.scrollTo(scrollPositionX, scrollPositionY)
+    }
+
     maxScrollTop = void 0
   }
 }

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

@@ -1,6 +1,6 @@
 
 import { reactive } from 'vue'
-import { injectProp } from './inject-obj-prop'
+import { injectProp } from './inject-obj-prop.js'
 
 export default __QUASAR_SSR_SERVER__
   ? (state, plugin) => {

package/dist/types/api/vue-prop-types.ts

@@ -1,15 +0,0 @@
-export type VueClassObjectProp = {
-  [value: string]: any
-}
-
-export type VueClassProp =
-  | string
-  | Array<VueClassProp>
-  | VueClassObjectProp;
-
-export type VueStyleObjectProp = Partial<CSSStyleDeclaration>;
-
-export type VueStyleProp =
-  | string
-  | Array<VueStyleProp>
-  | VueStyleObjectProp;

package/dist/types/typings.json

@@ -1,4 +0,0 @@
-{
-  "name": "quasar",
-  "main": "index.d.ts"
-}