Merging 4.2.3 changes

acidb · May 15, 2018 · c61f6c6 · c61f6c6
1 parent 36a7f2c
commit c61f6c6
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mobiscroll",
-  "version": "4.2.1",
+  "version": "4.2.3",
   "description": "Cross platform UI controls for progressive web an hybrid apps",
   "homepage": "https://mobiscroll.com/",
   "license": "Apache-2.0",

diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/angular-lite",
-    "version": "4.2.1",
+    "version": "4.2.3",
     "description": "Angular UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/packages/angularjs/package.json b/packages/angularjs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/angularjs-lite",
-    "version": "4.2.1",
+    "version": "4.2.3",
     "description": "AngularJS UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/packages/javascript/package.json b/packages/javascript/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/javascript-lite",
-    "version": "4.2.1",
+    "version": "4.2.3",
     "description": "Framework agnostic UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/packages/jquery/package.json b/packages/jquery/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/jquery-lite",
-    "version": "4.2.1",
+    "version": "4.2.3",
     "description": "jQuery and jQuery Mobile UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@mobiscroll/react-lite",
-    "version": "4.2.1",
+    "version": "4.2.3",
     "description": "React UI library for progressive web and hybrid apps",
     "homepage": "https://mobiscroll.com/",
     "license": "Apache-2.0",

diff --git a/src/js/classes/frame.js b/src/js/classes/frame.js
@@ -1,6 +1,7 @@
 import { $, extend, Base, mobiscroll, classes, instances } from '../core/core';
 import { os, majorVersion, isBrowser, userAgent } from '../util/platform';
 import { animEnd } from '../util/dom';
+import { getCoord, preventClick } from '../util/tap';
 import { constrain, isString, noop } from '../util/misc';
 
 var $activeElm,
@@ -816,20 +817,37 @@ export const Frame = function (el, settings, inherit) {
             }
 
             if (s.closeOnOverlayTap) {
-                var target;
-
-                $overlay.on('touchstart mousedown', function (ev) {
-                    target = ev.target == overlay;
-                }).on('mouseup', function (ev) {
-                    target = target && ev.target == overlay;
-                });
-
-                that.tap(overlay, function (ev) {
-                    if (target && ev.target == overlay) {
-                        that.cancel();
-                    }
-                    target = false;
-                });
+                var moved,
+                    target,
+                    startX,
+                    startY;
+
+                $overlay
+                    .on('touchstart mousedown', function (ev) {
+                        if (!target && ev.target == overlay) {
+                            target = true;
+                            moved = false;
+                            startX = getCoord(ev, 'X');
+                            startY = getCoord(ev, 'Y');
+                        }
+                    })
+                    .on('touchmove mousemove', function (ev) {
+                        if (target && !moved && (Math.abs(getCoord(ev, 'X') - startX) > 9 || Math.abs(getCoord(ev, 'Y') - startY) > 9)) {
+                            moved = true;
+                        }
+                    })
+                    .on('touchcancel', function () {
+                        target = false;
+                    })
+                    .on('touchend click', function (ev) {
+                        if (target && !moved) {
+                            that.cancel();
+                            if (ev.type == 'touchend') {
+                                preventClick();
+                            }
+                        }
+                        target = false;
+                    });
             }
         }
 

diff --git a/src/js/core/core.js b/src/js/core/core.js
@@ -1,5 +1,5 @@
 /*!
- * Mobiscroll v4.2.2
+ * Mobiscroll v4.2.3
  * http://mobiscroll.com
  *
  * Copyright 2010-2018, Acid Media
@@ -69,7 +69,7 @@ extend(util, {
 
 ms = extend(mobiscroll, {
     $: $,
-    version: '4.2.2',
+    version: '4.2.3',
     autoTheme: 'mobiscroll',
     themes: {
         form: {},