Merge branch 'master' of github.com:RubyLouvre/avalon

Conflicts:
	dist/avalon.mobile.min.js

Author: qitmac000408

dist/avalon.mobile.js

@@ -5033,7 +5033,7 @@ avalon.config({
 avalon.ready(function () {
     avalon.scan(DOC.body)
 })
-new function () {// jshint ignore:line
+new function() {// jshint ignore:line
     var touchProxy = {}
     var IEtouch = navigator.pointerEnabled
     var IEMStouch = navigator.msPointerEnabled
@@ -5050,16 +5050,16 @@ new function () {// jshint ignore:line
 
     if (IEtouch) {
         touchNames = ["pointerdown", "pointermove", "pointerup", "pointercancel"]
-    }
+    } 
     if (IEMStouch) {
         touchNames = ["MSPointerDown", "MSPointerMove", "MSPointerUp", "MSPointerCancel"]
     }
-    function isPrimaryTouch(event) {
+    function isPrimaryTouch(event){
         return (event.pointerType === 'touch' || event.pointerType === event.MSPOINTER_TYPE_TOUCH) && event.isPrimary
     }
 
-    function isPointerEventType(e, type) {
-        return (e.type === 'pointer' + type || e.type.toLowerCase() === 'mspointer' + type)
+    function isPointerEventType(e, type){
+        return (e.type === 'pointer'+type || e.type.toLowerCase() === 'mspointer'+type)
     }
 
     //判定滑动方向
@@ -5076,63 +5076,40 @@ new function () {// jshint ignore:line
         }
         el.dispatchEvent(event)
     }
-    function needsClick(target) {
-        switch (target.nodeName.toLowerCase()) {
-            // Don't send a synthetic click to disabled inputs (issue #62)
-            case 'button':
-            case 'select':
-            case 'textarea':
-                if (target.disabled) {
-                    return true;
-                }
-
-                break;
-            case 'input':
 
-                // File inputs need real clicks on iOS 6 due to a browser bug (issue #68)
-                if ((isAndroid && target.type === 'file') || target.disabled) {
-                    return true;
-                }
-
-                break;
-            case 'label':
-            case 'iframe': // iOS8 homescreen apps can prevent events bubbling into frames
-            case 'video':
-                return true;
-        }
-
-        return (/\bneedsclick\b/).test(target.className);
-    }
-    ;
-    function onMouse(event) {
-        var target = event.target
-              
+    function onMouse(event) { 
+        var target = event.target,
+            element = touchProxy.element
 
-        if (!needsClick(target)|| touchProxy.cancelNextClick ) {
-            
+        if (element && element !== target) {
+            var type = target.type || '',
+                targetTag = target.tagName.toLowerCase(),
+                elementTag = element.tagName.toLowerCase()
+            // 通过手机的“前往”提交表单时不可禁止默认行为；通过label focus input时也不可以阻止默认行为
+            if ((targetTag === 'input' &&  elementTag === "label") || type === 'submit') {
+                return false
+            }
             if (event.stopImmediatePropagation) {
                 event.stopImmediatePropagation()
             } else {
                 event.propagationStopped = true
             }
-            event.stopPropagation()
+            event.stopPropagation() 
             event.preventDefault()
         }
     }
     function cancelLongTap() {
-        if (longTapTimeout)
-            clearTimeout(longTapTimeout)
+        if (longTapTimeout) clearTimeout(longTapTimeout)
         longTapTimeout = null
     }
     function touchstart(event) {
         var _isPointerType = isPointerEventType(event, "down"),
-                firstTouch = _isPointerType ? event : event.touches[0],
-                element = "tagName" in firstTouch.target ? firstTouch.target : firstTouch.target.parentNode,
-                now = Date.now(),
-                delta = now - (touchProxy.last || now)
+            firstTouch = _isPointerType ? event : event.touches[0],
+            element = "tagName" in firstTouch.target ? firstTouch.target: firstTouch.target.parentNode,
+            now = Date.now(),
+            delta = now - (touchProxy.last || now)
 
-        if (_isPointerType && !isPrimaryTouch(event))
-            return
+        if (_isPointerType && !isPrimaryTouch(event)) return
         if (touchProxy.x1 || touchProxy.y1) {
             touchProxy.x1 = undefined
             touchProxy.y1 = undefined
@@ -5147,7 +5124,7 @@ new function () {// jshint ignore:line
         touchProxy.last = now
         touchProxy.element = element
 
-        longTapTimeout = setTimeout(function () {
+        longTapTimeout = setTimeout(function() {
             longTapTimeout = null
             fireEvent(element, "hold")
             fireEvent(element, "longtap")
@@ -5158,43 +5135,30 @@ new function () {// jshint ignore:line
     function touchmove(event) {
 
         var _isPointerType = isPointerEventType(event, 'down'),
-                firstTouch = _isPointerType ? event : event.touches[0],
-                x = firstTouch.pageX,
-                y = firstTouch.pageY
-        if (_isPointerType && !isPrimaryTouch(event))
-            return
+            firstTouch = _isPointerType ? event : event.touches[0],
+            x = firstTouch.pageX,
+            y = firstTouch.pageY
+        if (_isPointerType && !isPrimaryTouch(event)) return
         /*
-         android下某些浏览器触发了touchmove事件的话touchend事件不触发，禁用touchmove可以解决此bug
-         http://stackoverflow.com/questions/14486804/understanding-touch-events
-         */
+            android下某些浏览器触发了touchmove事件的话touchend事件不触发，禁用touchmove可以解决此bug
+            http://stackoverflow.com/questions/14486804/understanding-touch-events
+        */
         if (isGoingtoFixTouchEndEvent && Math.abs(touchProxy.x - x) > 10) {
             event.preventDefault()
         }
         cancelLongTap()
-
+        
         touchProxy.x1 = x // touchend事件没有pageX、pageY始终为0，且没有clientX和clientY事件
         touchProxy.y1 = y
         touchProxy.mx += Math.abs(touchProxy.x - x)
         touchProxy.my += Math.abs(touchProxy.y - y)
     }
-    function touchend(event) {
-
-
-        //如果点得太快,直接忽略 
-        if ((event.timeStamp - touchProxy.lastClickTime) < 200) {
-            touchProxy.cancelNextClick = true;
-            return true;
-        }
-        touchProxy.cancelNextClick = false;
-
-        touchProxy.lastClickTime = event.timeStamp;
+    function touchend(event) { 
         var _isPointerType = isPointerEventType(event, 'down'),
-                element = touchProxy.element
+            element = touchProxy.element
 
-        if (_isPointerType && !isPrimaryTouch(event))
-            return
-        if (!element)
-            return // longtap|hold触发后touchProxy为{}
+        if (_isPointerType && !isPrimaryTouch(event)) return
+        if (!element) return // longtap|hold触发后touchProxy为{}
 
         cancelLongTap()
         if ((touchProxy.x1 && Math.abs(touchProxy.x1 - touchProxy.x) > dragDistance) || (touchProxy.y1 && Math.abs(touchProxy.y1 - touchProxy.y) > dragDistance)) {
@@ -5214,11 +5178,10 @@ new function () {// jshint ignore:line
                     touchProxy = {}
                     touchProxy.element = element
                 } else {
-                    touchTimeout = setTimeout(function () {
+                    touchTimeout = setTimeout(function() {
                         clearTimeout(touchTimeout)
                         touchTimeout = null
-                        if (touchProxy.element)
-                            fireEvent(touchProxy.element, "singletap")
+                        if (touchProxy.element) fireEvent(touchProxy.element, "singletap")
                         touchProxy = {};
                         touchProxy.element = element
                     }, 250)
@@ -5234,16 +5197,14 @@ new function () {// jshint ignore:line
     document.addEventListener(touchNames[1], touchmove)
     document.addEventListener(touchNames[2], touchend)
     if (touchNames[3]) {
-        document.addEventListener(touchNames[3], function (event) {
-            if (longTapTimeout)
-                clearTimeout(longTapTimeout)
-            if (touchTimeout)
-                clearTimeout(touchTimeout)
+        document.addEventListener(touchNames[3], function(event) {
+            if (longTapTimeout) clearTimeout(longTapTimeout)
+            if (touchTimeout) clearTimeout(touchTimeout)
             longTapTimeout = touchTimeout = null
             touchProxy = {}
         })
     }
-    ["swipe", "swipeleft", "swiperight", "swipeup", "swipedown", "doubletap", "tap", "singletap", "longtap", "hold"].forEach(function (method) {
+    ["swipe", "swipeleft", "swiperight", "swipeup", "swipedown", "doubletap", "tap", "singletap", "dblclick", "longtap", "hold"].forEach(function(method) {
         me[method + "Hook"] = me["clickHook"]
     })