targetj 1.0.116 → 1.0.117

package/build/EventListener.js

@@ -305,7 +305,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       }
       if (this.currentHandlers.touch !== touchHandler) {
         this.currentHandlers.enterEvent = touchHandler;
-        this.currentHandlers.leaveEvent = _TUtil.TUtil.contains(this.currentHandlers.touch, touchHandler) ? undefined : this.currentHandlers.touch;
+        this.currentHandlers.leaveEvent = this.currentHandlers.touch;
       }
       if (this.currentHandlers.focus !== focusHandler) {
         this.currentHandlers.justFocused = focusHandler;
@@ -320,10 +320,10 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "captureEvents",
     value: function captureEvents() {
-      this.currentHandlers.enterEvent = null;
-      this.currentHandlers.leaveEvent = null;
-      this.currentHandlers.justFocused = null;
-      this.currentHandlers.blur = null;
+      this.currentHandlers.enterEvent = undefined;
+      this.currentHandlers.leaveEvent = undefined;
+      this.currentHandlers.justFocused = undefined;
+      this.currentHandlers.blur = undefined;
       if (this.eventQueue.length === 0) {
         this.currentEventName = "";
         this.currentEventType = "";
@@ -613,7 +613,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "isEndEvent",
     value: function isEndEvent() {
-      return this.getEventType() === 'end';
+      return this.getEventType() === 'end' || this.getEventType() === 'click';
     }
   }, {
     key: "isStartEvent",
@@ -640,11 +640,6 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     value: function isClickHandlerType(type) {
       return this.getTouchHandlerType() === type && this.isClickEvent();
     }
-  }, {
-    key: "isTouchEndHandler",
-    value: function isTouchEndHandler(handler) {
-      return this.getTouchHandler() === handler && this.getEventType() === 'end';
-    }
   }, {
     key: "isTouchHandler",
     value: function isTouchHandler(handler) {
@@ -653,12 +648,12 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
   }, {
     key: "isEnterEventHandler",
     value: function isEnterEventHandler(handler) {
-      return _TUtil.TUtil.contains(handler, this.currentHandlers.enterEvent);
+      return _TUtil.TUtil.contains(handler, this.currentHandlers.enterEvent) && !_TUtil.TUtil.contains(handler, this.currentHandlers.leaveEvent);
     }
   }, {
     key: "isLeaveEventHandler",
     value: function isLeaveEventHandler(handler) {
-      return _TUtil.TUtil.contains(handler, this.currentHandlers.leaveEvent) && !this.isEnterEventHandler(handler);
+      return _TUtil.TUtil.contains(handler, this.currentHandlers.leaveEvent) && !_TUtil.TUtil.contains(handler, this.currentHandlers.enterEvent);
     }
   }, {
     key: "onFocus",
@@ -720,8 +715,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     }
   }, {
     key: "containsTouchHandler",
-    value: function containsTouchHandler(target) {
-      return _TUtil.TUtil.contains(target, this.getTouchHandler());
+    value: function containsTouchHandler(tmodel) {
+      return _TUtil.TUtil.contains(tmodel, this.getTouchHandler());
     }
   }, {
     key: "countTouches",

package/build/TUtil.js

@@ -76,17 +76,11 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
   }, {
     key: "contains",
     value: function contains(container, tmodel) {
-      var _tmodel$getDomParent, _tmodel$getDomParent2;
+      var _tmodel$getDomParent;
       if (!container || !tmodel) {
         return false;
       }
-      if (container === tmodel || tmodel.getDomHolder() === container.$dom) {
-        return true;
-      }
-      if (((_tmodel$getDomParent = tmodel.getDomParent()) === null || _tmodel$getDomParent === void 0 ? void 0 : _tmodel$getDomParent.getDomHolder()) === container.$dom) {
-        return true;
-      }
-      if (((_tmodel$getDomParent2 = tmodel.getDomParent()) === null || _tmodel$getDomParent2 === void 0 || (_tmodel$getDomParent2 = _tmodel$getDomParent2.getDomParent()) === null || _tmodel$getDomParent2 === void 0 ? void 0 : _tmodel$getDomParent2.getDomHolder()) === container.$dom) {
+      if (container === tmodel || tmodel.getDomParent() === container || ((_tmodel$getDomParent = tmodel.getDomParent()) === null || _tmodel$getDomParent === void 0 ? void 0 : _tmodel$getDomParent.getDomParent()) === container) {
         return true;
       }
       return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.116",
+  "version": "1.0.117",
   "keywords": [
     "targetj"
   ],