quasar 2.14.5 → 2.14.6

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

@@ -162,7 +162,7 @@ export default function () {
   function goToPanelByOffset (direction, startIndex = panelIndex.value) {
     let index = startIndex + direction
 
-    while (index > -1 && index < panels.length) {
+    while (index !== -1 && index < panels.length) {
       const opt = panels[ index ]
 
       if (

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

@@ -74,7 +74,7 @@ export default function (vm, innerRef, renderPortalContent, type) {
   function hidePortal (isReady) {
     portalIsAccessible.value = false
 
-    if (isReady !== true) { return }
+    if (isReady !== true) return
 
     removeFocusWaitFlag(focusObj)
     portalIsActive.value = false

package/src/composables/private/use-router-link.js

@@ -177,7 +177,7 @@ export default function ({ fallbackTag, useDisableForRouterLinkProps = true } =
       isSameRouteRecord.bind(null, routeMatched)
     )
 
-    if (index > -1) {
+    if (index !== -1) {
       return index
     }
 

package/src/directives/TouchPan.js

@@ -191,7 +191,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
                 // account for UMD too where modifiers will be lowercased to work
                 && (mouseEvent !== true || (ctx.modifiers.mouseAllDir !== true && ctx.modifiers.mousealldir !== true))
               ) {
-                const clone = evt.type.indexOf('mouse') > -1
+                const clone = evt.type.indexOf('mouse') !== -1
                   ? new MouseEvent(evt.type, evt)
                   : new TouchEvent(evt.type, evt)
 

package/src/history.js

@@ -43,7 +43,7 @@ export default {
   remove: noop,
 
   install ({ $q }) {
-    if (__QUASAR_SSR_SERVER__ || this.__installed === true) { return }
+    if (__QUASAR_SSR_SERVER__ || this.__installed === true) return
 
     const { cordova, capacitor } = client.is
 

package/src/index.umd.js

@@ -12,7 +12,11 @@ import * as plugins from './plugins.js'
 import * as utils from './utils.js'
 import * as composables from './composables.js'
 
-export default {
+if (window.Vue === void 0) {
+  console.error('[ Quasar ] Vue is required to run. Please add a script tag for it before loading Quasar.')
+}
+
+window.Quasar = {
   version: __QUASAR_VERSION__,
   install (app, opts) {
     installQuasar(app, {

package/src/lang.js

@@ -3,7 +3,7 @@ import defineReactivePlugin from './utils/private/define-reactive-plugin.js'
 import defaultLang from '../lang/en-US'
 
 function getLocale () {
-  if (__QUASAR_SSR_SERVER__) { return }
+  if (__QUASAR_SSR_SERVER__) return
 
   const val = Array.isArray(navigator.languages) === true && navigator.languages.length !== 0
     ? navigator.languages[ 0 ]

package/src/plugins/BottomSheet.json

@@ -100,7 +100,7 @@
 
             "persistent": {
               "type": "Boolean",
-              "desc": "User cannot dismiss Bottom Sheet if clicking outside of it or hitting ESC key"
+              "desc": "User cannot dismiss Bottom Sheet if clicking outside of it or hitting ESC key; Also, an app route change won't dismiss it"
             }
           }
         }

package/src/plugins/Cookies.js

@@ -32,7 +32,7 @@ function read (string) {
       string = parsed
     }
   }
-  catch (e) {}
+  catch (_) {}
 
   return string
 }

package/src/plugins/Dark.js

@@ -7,7 +7,7 @@ const Plugin = defineReactivePlugin({
   __media: void 0,
 
   set (val) {
-    if (__QUASAR_SSR_SERVER__) { return }
+    if (__QUASAR_SSR_SERVER__) return
 
     Plugin.mode = val
 

package/src/plugins/Loading.js

@@ -49,7 +49,7 @@ const Plugin = defineReactivePlugin({
   isActive: false
 }, {
   show (opts) {
-    if (__QUASAR_SSR_SERVER__) { return }
+    if (__QUASAR_SSR_SERVER__) return
 
     props = registerProps(opts)
     const { group } = props

package/src/plugins/LoadingBar.js

@@ -21,7 +21,7 @@ const Plugin = defineReactivePlugin({
   install ({ $q, parentApp }) {
     $q.loadingBar = this
 
-    if (__QUASAR_SSR_SERVER__) { return }
+    if (__QUASAR_SSR_SERVER__) return
 
     if (this.__installed === true) {
       if ($q.config.loadingBar !== void 0) {

package/src/plugins/Notify.js

@@ -254,7 +254,7 @@ function addNotification (config, $q, originalApi) {
         )
       }
       else {
-        const action = notif.position.indexOf('top') > -1 ? 'unshift' : 'push'
+        const action = notif.position.indexOf('top') !== -1 ? 'unshift' : 'push'
         notificationsList[ notif.position ].value[ action ](notif)
       }
 
@@ -276,7 +276,7 @@ function addNotification (config, $q, originalApi) {
         }
       }
       else {
-        notif.badgePosition = `top-${ notif.position.indexOf('left') > -1 ? 'right' : 'left' }`
+        notif.badgePosition = `top-${ notif.position.indexOf('left') !== -1 ? 'right' : 'left' }`
       }
 
       notif.meta.uid = original.meta.uid
@@ -529,8 +529,8 @@ export default {
         notificationsList[ pos ] = ref([])
 
         const
-          vert = [ 'left', 'center', 'right' ].includes(pos) === true ? 'center' : (pos.indexOf('top') > -1 ? 'top' : 'bottom'),
-          align = pos.indexOf('left') > -1 ? 'start' : (pos.indexOf('right') > -1 ? 'end' : 'center'),
+          vert = [ 'left', 'center', 'right' ].includes(pos) === true ? 'center' : (pos.indexOf('top') !== -1 ? 'top' : 'bottom'),
+          align = pos.indexOf('left') !== -1 ? 'start' : (pos.indexOf('right') !== -1 ? 'end' : 'center'),
           classes = [ 'left', 'right' ].includes(pos) ? `items-${ pos === 'left' ? 'start' : 'end' } justify-center` : (pos === 'center' ? 'flex-center' : `items-${ align }`)
 
         positionClass[ pos ] = `q-notifications__list q-notifications__list--${ vert } fixed column no-wrap ${ classes }`

package/src/plugins/Platform.js

@@ -19,8 +19,7 @@ export const isRuntimeSsrPreHydration = __QUASAR_SSR_SERVER__
     )
   )
 
-export let iosEmulated = false
-export let iosCorrection
+let preHydrationBrowser
 
 function getMatch (userAgent, platformMatch) {
   const match = /(edg|edge|edga|edgios)\/([\w.]+)/.exec(userAgent)
@@ -66,24 +65,6 @@ const hasTouch = __QUASAR_SSR_SERVER__
   ? false
   : 'ontouchstart' in window || window.navigator.maxTouchPoints > 0
 
-function applyIosCorrection (is) {
-  iosCorrection = { is: { ...is } }
-
-  delete is.mac
-  delete is.desktop
-
-  const platform = Math.min(window.innerHeight, window.innerWidth) > 414
-    ? 'ipad'
-    : 'iphone'
-
-  Object.assign(is, {
-    mobile: true,
-    ios: true,
-    platform,
-    [ platform ]: true
-  })
-}
-
 function getPlatform (UA) {
   const
     userAgent = UA.toLowerCase(),
@@ -114,21 +95,11 @@ function getPlatform (UA) {
     || browser[ 'windows phone' ]
 
   // These are all considered mobile platforms, meaning they run a mobile browser
-  if (knownMobiles === true || userAgent.indexOf('mobile') > -1) {
+  if (
+    knownMobiles === true
+    || userAgent.indexOf('mobile') !== -1
+  ) {
     browser.mobile = true
-
-    if (browser.edga || browser.edgios) {
-      browser.edge = true
-      matched.browser = 'edge'
-    }
-    else if (browser.crios) {
-      browser.chrome = true
-      matched.browser = 'chrome'
-    }
-    else if (browser.fxios) {
-      browser.firefox = true
-      matched.browser = 'firefox'
-    }
   }
   // If it's not mobile we should consider it's desktop platform, meaning it runs a desktop browser
   // It's a workaround for anonymized user agents
@@ -137,22 +108,38 @@ function getPlatform (UA) {
     browser.desktop = true
   }
 
+  if (browser[ 'windows phone' ]) {
+    browser.winphone = true
+    delete browser[ 'windows phone' ]
+  }
+
+  if (browser.edga || browser.edgios) {
+    browser.edge = true
+    matched.browser = 'edge'
+  }
+  else if (browser.crios) {
+    browser.chrome = true
+    matched.browser = 'chrome'
+  }
+  else if (browser.fxios) {
+    browser.firefox = true
+    matched.browser = 'firefox'
+  }
   // Set iOS if on iPod, iPad or iPhone
-  if (browser.ipod || browser.ipad || browser.iphone) {
+  else if (browser.ipod || browser.ipad || browser.iphone) {
     browser.ios = true
   }
 
-  if (browser[ 'windows phone' ]) {
-    browser.winphone = true
-    delete browser[ 'windows phone' ]
+  if (browser.vivaldi) {
+    matched.browser = 'vivaldi'
+    browser.vivaldi = true
   }
 
   // TODO: The assumption about WebKit based browsers below is not completely accurate.
   // Google released Blink(a fork of WebKit) engine on April 3, 2013, which is really different than WebKit today.
   // Today, one might want to check for WebKit to deal with its bugs, which is used on all browsers on iOS, and Safari browser on all platforms.
-
-  // Chrome, Opera 15+, Vivaldi and Safari are webkit based browsers
   if (
+    // Chrome, Opera 15+, Vivaldi and Safari are webkit based browsers
     browser.chrome
     || browser.opr
     || browser.safari
@@ -167,52 +154,40 @@ function getPlatform (UA) {
     browser.webkit = true
   }
 
-  // TODO: (Qv3) rename the terms 'edge' to 'edge legacy'(or remove it) then 'edge chromium' to 'edge' to match with the known up-to-date terms
+  // TODO: (Qv3) rename the terms 'edge' to 'edge legacy' (or remove it) then 'edge chromium' to 'edge' to match with the known up-to-date terms
   // Microsoft Edge is the new Chromium-based browser. Microsoft Edge Legacy is the old EdgeHTML-based browser (EOL: March 9, 2021).
   if (browser.edg) {
     matched.browser = 'edgechromium'
     browser.edgeChromium = true
   }
-
-  // Blackberry browsers are marked as Safari on BlackBerry
-  if ((browser.safari && browser.blackberry) || browser.bb) {
-    matched.browser = 'blackberry'
-    browser.blackberry = true
-  }
-
-  // Playbook browsers are marked as Safari on Playbook
-  if (browser.safari && browser.playbook) {
-    matched.browser = 'playbook'
-    browser.playbook = true
-  }
-
   // Opera 15+ are identified as opr
-  if (browser.opr) {
+  else if (browser.opr) {
     matched.browser = 'opera'
     browser.opera = true
   }
 
-  // Stock Android browsers are marked as Safari on Android.
-  if (browser.safari && browser.android) {
-    matched.browser = 'android'
-    browser.android = true
-  }
-
-  // Kindle browsers are marked as Safari on Kindle
-  if (browser.safari && browser.kindle) {
-    matched.browser = 'kindle'
-    browser.kindle = true
-  }
-
-  // Kindle Silk browsers are marked as Safari on Kindle
-  if (browser.safari && browser.silk) {
-    matched.browser = 'silk'
-    browser.silk = true
-  }
-
-  if (browser.vivaldi) {
-    matched.browser = 'vivaldi'
-    browser.vivaldi = true
+  // Some browsers are marked as Safari but are not
+  if (browser.safari) {
+    if (browser.blackberry || browser.bb) {
+      matched.browser = 'blackberry'
+      browser.blackberry = true
+    }
+    else if (browser.playbook) {
+      matched.browser = 'playbook'
+      browser.playbook = true
+    }
+    else if (browser.android) {
+      matched.browser = 'android'
+      browser.android = true
+    }
+    else if (browser.kindle) {
+      matched.browser = 'kindle'
+      browser.kindle = true
+    }
+    else if (browser.silk) {
+      matched.browser = 'silk'
+      browser.silk = true
+    }
   }
 
   // Assign the name and platform variable
@@ -220,10 +195,10 @@ function getPlatform (UA) {
   browser.platform = matched.platform
 
   if (__QUASAR_SSR_SERVER__ !== true) {
-    if (userAgent.indexOf('electron') > -1) {
+    if (userAgent.indexOf('electron') !== -1) {
       browser.electron = true
     }
-    else if (document.location.href.indexOf('-extension://') > -1) {
+    else if (document.location.href.indexOf('-extension://') !== -1) {
       browser.bex = true
     }
     else {
@@ -238,6 +213,24 @@ function getPlatform (UA) {
         browser.nativeMobileWrapper = 'cordova'
       }
 
+      if (isRuntimeSsrPreHydration.value === true) {
+        /*
+         * We need to remember the current state as
+         * everything that follows can only be corrected client-side,
+         * but we don't want to brake the hydration.
+         *
+         * The "client" object is imported throughout the UI and should
+         * be as accurate as possible given all the knowledge that we posses
+         * because decisions are required to be made immediately, even
+         * before the hydration occurs.
+         */
+        preHydrationBrowser = { is: { ...browser } }
+      }
+
+      /*
+       * All the following should be client-side corrections only
+       */
+
       if (
         hasTouch === true
         && browser.mac === true
@@ -252,13 +245,40 @@ function getPlatform (UA) {
         )
       ) {
         /*
-        * Correction needed for iOS since the default
-        * setting on iPad is to request desktop view; if we have
-        * touch support and the user agent says it's a
-        * desktop, we infer that it's an iPhone/iPad with desktop view
-        * so we must fix the false positives
-        */
-        applyIosCorrection(browser)
+         * Correction needed for iOS since the default
+         * setting on iPad is to request desktop view; if we have
+         * touch support and the user agent says it's a
+         * desktop, we infer that it's an iPhone/iPad with desktop view
+         * so we must fix the false positives
+         */
+
+        delete browser.mac
+        delete browser.desktop
+
+        const platform = Math.min(window.innerHeight, window.innerWidth) > 414
+          ? 'ipad'
+          : 'iphone'
+
+        Object.assign(browser, {
+          mobile: true,
+          ios: true,
+          platform,
+          [ platform ]: true
+        })
+      }
+
+      if (
+        browser.mobile !== true
+        && window.navigator.userAgentData
+        && window.navigator.userAgentData.mobile
+      ) {
+        /*
+         * Correction needed on client-side when
+         * we also have the navigator userAgentData
+         */
+
+        delete browser.desktop
+        browser.mobile = true
       }
     }
   }
@@ -310,7 +330,6 @@ const Platform = {
       opts.onSSRHydrated.push(() => {
         Object.assign($q.platform, client)
         isRuntimeSsrPreHydration.value = false
-        iosCorrection = void 0
       })
 
       // we need to make platform reactive
@@ -350,23 +369,22 @@ else {
         return true
       }
     }
-    catch (e) {}
+    catch (_) {}
 
     hasWebStorage = false
     return false
   })
 
-  iosEmulated = client.is.ios === true
-    && window.navigator.vendor.toLowerCase().indexOf('apple') === -1
+  Object.assign(Platform, client)
 
   if (isRuntimeSsrPreHydration.value === true) {
     // must match with server-side before
     // client taking over in order to prevent
     // hydration errors
-    Object.assign(Platform, client, iosCorrection, ssrClient)
-  }
-  else {
-    Object.assign(Platform, client)
+    Object.assign(Platform, preHydrationBrowser, ssrClient)
+
+    // free up memory
+    preHydrationBrowser = null
   }
 }
 

package/src/plugins/Screen.js

@@ -44,7 +44,7 @@ export default defineReactivePlugin({
   install ({ $q, onSSRHydrated }) {
     $q.screen = this
 
-    if (__QUASAR_SSR_SERVER__) { return }
+    if (__QUASAR_SSR_SERVER__) return
 
     if (this.__installed === true) {
       if ($q.config.screen !== void 0) {

package/src/utils/event.js

@@ -19,7 +19,7 @@ try {
   window.addEventListener('qtest', null, opts)
   window.removeEventListener('qtest', null, opts)
 }
-catch (e) {}
+catch (_) {}
 
 export function noop () {}
 

package/src/utils/frame-debounce.js

@@ -3,7 +3,7 @@ export default function (fn) {
 
   function debounced (/* ...args */) {
     callArgs = arguments
-    if (wait === true) { return }
+    if (wait === true) return
 
     wait = true
     frame = requestAnimationFrame(() => {

package/src/utils/morph.js

@@ -60,7 +60,7 @@ function getComputedStyle (el, props) {
 
         fixed[ prop ] = val
       }
-      else if ([ 'borderWidth', 'borderStyle', 'borderColor' ].indexOf(prop) > -1) {
+      else if ([ 'borderWidth', 'borderStyle', 'borderColor' ].indexOf(prop) !== -1) {
         const suffix = prop.replace('border', '')
         let val = ''
         for (let j = 0; j < styleEdges.length; j++) {

package/src/utils/private/click-outside.js

@@ -86,7 +86,7 @@ export function addClickOutside (clickOutsideProps) {
 export function removeClickOutside (clickOutsideProps) {
   const index = registeredList.findIndex(h => h === clickOutsideProps)
 
-  if (index > -1) {
+  if (index !== -1) {
     registeredList.splice(index, 1)
 
     if (registeredList.length === 0) {

package/src/utils/private/escape-key.js

@@ -43,7 +43,7 @@ export function addEscapeKey (fn) {
 
 export function removeEscapeKey (fn) {
   const index = handlers.indexOf(fn)
-  if (index > -1) {
+  if (index !== -1) {
     handlers.splice(index, 1)
 
     if (handlers.length === 0) {

package/src/utils/private/focusout.js

@@ -18,7 +18,7 @@ export function addFocusout (fn) {
 
 export function removeFocusout (fn) {
   const index = handlers.indexOf(fn)
-  if (index > -1) {
+  if (index !== -1) {
     handlers.splice(index, 1)
 
     if (handlers.length === 0) {