继续优化

gto999 · Apr 11, 2017 · c4e0bf2 · c4e0bf2
1 parent 86a1ea0
commit c4e0bf2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/annie/display/DisplayObject.ts b/annie/display/DisplayObject.ts
@@ -385,11 +385,11 @@ namespace annie {
          * @param {boolean} isMouseEvent 是否是鼠标事件调用此方法,用户一般无须理会,除非你要模拟鼠标点击可以
          * @returns {annie.DisplayObject}
          */
-        public hitTestPoint(globalPoint: Point, isMouseEvent: boolean = false): DisplayObject {
+        public hitTestPoint(globalPoint: Point,isMouseEvent: boolean = false): DisplayObject {
             let s = this;
             if (!s.visible)return null;
             if (isMouseEvent && !s.mouseEnable)return null;
-            if (s.getBounds().isPointIn(s.globalToLocal(globalPoint, isMouseEvent?DisplayObject._bp:null))) {
+            if (s.getBounds().isPointIn(s.globalToLocal(globalPoint, DisplayObject._bp))){
                 return s;
             }
             return null;

diff --git a/build/annieCore.d.ts b/build/annieCore.d.ts
@@ -2868,7 +2868,7 @@ declare namespace annie {
          */
         iosTouchendPreventDefault: boolean;
         /**
-         * 是否禁止引擎所在的canvas的鼠标或触摸事件的默认形为，默认是静止的。
+         * 是否禁止引擎所在的canvas的鼠标事件或触摸事件的默认形为，默认为true是禁止的。
          * @property isPreventDefaultEvent
          * @since 1.0.9
          * @default true

diff --git a/build/annieCore.js b/build/annieCore.js
@@ -1759,7 +1759,7 @@ var annie;
                 return null;
             if (isMouseEvent && !s.mouseEnable)
                 return null;
-            if (s.getBounds().isPointIn(s.globalToLocal(globalPoint, isMouseEvent ? DisplayObject._bp : null))) {
+            if (s.getBounds().isPointIn(s.globalToLocal(globalPoint, DisplayObject._bp))) {
                 return s;
             }
             return null;
@@ -5752,7 +5752,7 @@ var annie;
              */
             this.iosTouchendPreventDefault = true;
             /**
-             * 是否禁止引擎所在的canvas的鼠标或触摸事件的默认形为，默认是静止的。
+             * 是否禁止引擎所在的canvas的鼠标事件或触摸事件的默认形为，默认为true是禁止的。
              * @property isPreventDefaultEvent
              * @since 1.0.9
              * @default true
@@ -6190,11 +6190,13 @@ var annie;
                         }
                     }
                 }
-                if ((e.type == "touchend") && (annie.osType == "ios") && (s.iosTouchendPreventDefault)) {
-                    e.preventDefault();
-                }
-                if ((e.type == "touchmove") || (e.type == "touchstart" && annie.osType == "android")) {
-                    e.preventDefault();
+                if (s.isPreventDefaultEvent) {
+                    if ((e.type == "touchend") && (annie.osType == "ios") && (s.iosTouchendPreventDefault)) {
+                        e.preventDefault();
+                    }
+                    if ((e.type == "touchmove") || (e.type == "touchstart" && annie.osType == "android")) {
+                        e.preventDefault();
+                    }
                 }
                 if (s._uae) {
                     s.update();

diff --git a/build/annieCore.min.js b/build/annieCore.min.js