quasar 2.9.0 → 2.9.2

package/src/directives/TouchPan.js

@@ -188,7 +188,8 @@ export default createDirective(__QUASAR_SSR_SERVER__
               */
               if (
                 ctx.direction.all !== true
-                && (mouseEvent !== true || ctx.modifiers.mouseAllDir !== true)
+                // 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
                   ? new MouseEvent(evt.type, evt)
@@ -255,9 +256,12 @@ export default createDirective(__QUASAR_SSR_SERVER__
             const start = () => {
               handleEvent(evt, isMouseEvt)
 
-              if (modifiers.preserveCursor !== true) {
+              let cursor
+              if (modifiers.preserveCursor !== true && modifiers.preservecursor !== true) {
+                cursor = document.documentElement.style.cursor || ''
                 document.documentElement.style.cursor = 'grabbing'
               }
+
               isMouseEvt === true && document.body.classList.add('no-pointer-events--children')
               document.body.classList.add('non-selectable')
               clearSelection()
@@ -265,9 +269,10 @@ export default createDirective(__QUASAR_SSR_SERVER__
               ctx.styleCleanup = withDelayedFn => {
                 ctx.styleCleanup = void 0
 
-                if (modifiers.preserveCursor !== true) {
-                  document.documentElement.style.cursor = ''
+                if (cursor !== void 0) {
+                  document.documentElement.style.cursor = cursor
                 }
+
                 document.body.classList.remove('non-selectable')
 
                 if (isMouseEvt === true) {
@@ -315,7 +320,8 @@ export default createDirective(__QUASAR_SSR_SERVER__
 
             if (
               ctx.direction.all === true
-              || (isMouseEvt === true && ctx.modifiers.mouseAllDir === true)
+              // account for UMD too where modifiers will be lowercased to work
+              || (isMouseEvt === true && (ctx.modifiers.mouseAllDir === true || ctx.modifiers.mousealldir === true))
             ) {
               start()
               ctx.event.detected = true
@@ -382,9 +388,16 @@ export default createDirective(__QUASAR_SSR_SERVER__
 
         el.__qtouchpan = ctx
 
-        modifiers.mouse === true && addEvt(ctx, 'main', [
-          [ el, 'mousedown', 'mouseStart', `passive${ modifiers.mouseCapture === true ? 'Capture' : '' }` ]
-        ])
+        if (modifiers.mouse === true) {
+          // account for UMD too where modifiers will be lowercased to work
+          const capture = modifiers.mouseCapture === true || modifiers.mousecapture === true
+            ? 'Capture'
+            : ''
+
+          addEvt(ctx, 'main', [
+            [ el, 'mousedown', 'mouseStart', `passive${ capture }` ]
+          ])
+        }
 
         client.has.touch === true && addEvt(ctx, 'main', [
           [ el, 'touchstart', 'touchStart', `passive${ modifiers.capture === true ? 'Capture' : '' }` ],

package/src/directives/TouchPan.json

@@ -123,11 +123,6 @@
       "desc": "Calls event.preventDefault() for touch events"
     },
 
-    "mightPrevent": {
-      "type": "Boolean",
-      "desc": "Required when you might call event.preventDefault() in your handler for touch events"
-    },
-
     "capture": {
       "type": "Boolean",
       "desc": "Use capture for touchstart event"

package/src/directives/TouchRepeat.js

@@ -203,18 +203,32 @@ export default createDirective(__QUASAR_SSR_SERVER__
 
         el.__qtouchrepeat = ctx
 
-        modifiers.mouse === true && addEvt(ctx, 'main', [
-          [ el, 'mousedown', 'mouseStart', `passive${ modifiers.mouseCapture === true ? 'Capture' : '' }` ]
-        ])
+        if (modifiers.mouse === true) {
+          // account for UMD too where modifiers will be lowercased to work
+          const capture = modifiers.mouseCapture === true || modifiers.mousecapture === true
+            ? 'Capture'
+            : ''
+
+          addEvt(ctx, 'main', [
+            [ el, 'mousedown', 'mouseStart', `passive${ capture }` ]
+          ])
+        }
 
         client.has.touch === true && addEvt(ctx, 'main', [
           [ el, 'touchstart', 'touchStart', `passive${ modifiers.capture === true ? 'Capture' : '' }` ],
           [ el, 'touchend', 'noop', 'passiveCapture' ]
         ])
 
-        keyboard.length > 0 && addEvt(ctx, 'main', [
-          [ el, 'keydown', 'keyboardStart', `notPassive${ modifiers.keyCapture === true ? 'Capture' : '' }` ]
-        ])
+        if (keyboard.length !== 0) {
+          // account for UMD too where modifiers will be lowercased to work
+          const capture = modifiers.keyCapture === true || modifiers.keycapture === true
+            ? 'Capture'
+            : ''
+
+          addEvt(ctx, 'main', [
+            [ el, 'keydown', 'keyboardStart', `notPassive${ capture }` ]
+          ])
+        }
       },
 
       updated (el, { oldValue, value }) {

package/src/directives/TouchSwipe.js

@@ -228,9 +228,16 @@ export default createDirective(__QUASAR_SSR_SERVER__
 
         el.__qtouchswipe = ctx
 
-        modifiers.mouse === true && addEvt(ctx, 'main', [
-          [ el, 'mousedown', 'mouseStart', `passive${ mouseCapture }` ]
-        ])
+        if (modifiers.mouse === true) {
+          // account for UMD too where modifiers will be lowercased to work
+          const capture = modifiers.mouseCapture === true || modifiers.mousecapture === true
+            ? 'Capture'
+            : ''
+
+          addEvt(ctx, 'main', [
+            [ el, 'mousedown', 'mouseStart', `passive${ capture }` ]
+          ])
+        }
 
         client.has.touch === true && addEvt(ctx, 'main', [
           [ el, 'touchstart', 'touchStart', `passive${ modifiers.capture === true ? 'Capture' : '' }` ],

package/src/utils/extend.js

@@ -2,7 +2,7 @@ const
   toString = Object.prototype.toString,
   hasOwn = Object.prototype.hasOwnProperty,
   notPlainObject = new Set(
-    [ 'Boolean', 'Number', 'String', 'Function', 'Array', 'Date', 'RegExp', 'Object' ]
+    [ 'Boolean', 'Number', 'String', 'Function', 'Array', 'Date', 'RegExp' ]
       .map(name => '[object ' + name + ']')
   )
 
@@ -14,7 +14,7 @@ function isPlainObject (obj) {
   if (
     obj.constructor
     && hasOwn.call(obj, 'constructor') === false
-    && !hasOwn.call(obj.constructor.prototype, 'isPrototypeOf') === false
+    && hasOwn.call(obj.constructor.prototype, 'isPrototypeOf') === false
   ) {
     return false
   }

package/src/utils/morph.js

@@ -154,9 +154,13 @@ function normalizeOptions (options) {
     fill: typeof options.fill === 'string' && options.fill.length > 0 ? options.fill : 'none',
 
     resize: options.resize === true,
-    useCSS: options.useCSS === true,
-    hideFromClone: options.hideFromClone === true,
-    keepToClone: options.keepToClone === true,
+
+    // account for UMD too where modifiers will be lowercased to work
+    useCSS: options.useCSS === true || options.usecss === true,
+    // account for UMD too where modifiers will be lowercased to work
+    hideFromClone: options.hideFromClone === true || options.hidefromclone === true,
+    // account for UMD too where modifiers will be lowercased to work
+    keepToClone: options.keepToClone === true || options.keeptoclone === true,
 
     tween: options.tween === true,
     tweenFromOpacity: isNaN(options.tweenFromOpacity) === true ? 0.6 : parseFloat(options.tweenFromOpacity),