targetj 1.0.113 → 1.0.115

package/build/$Dom.js

@@ -39,8 +39,8 @@ var $Dom = exports.$Dom = /*#__PURE__*/function () {
     }
   }, {
     key: "contains",
-    value: function contains(dom) {
-      return dom instanceof $Dom ? this.element.contains(dom.element) : this.element.contains(dom);
+    value: function contains(element) {
+      return element instanceof Node && this.element.contains(element);
     }
   }, {
     key: "create",

package/build/EventListener.js

@@ -34,15 +34,14 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     this.touchTimeStamp = 0;
     this.cursor = {
       x: 0,
-      y: 0,
-      handlerX: 0,
-      handlerY: 0
+      y: 0
     };
     this.start0 = undefined;
     this.start1 = undefined;
     this.end0 = undefined;
     this.end1 = undefined;
     this.touchCount = 0;
+    this.canFindHandlers = true;
     this.currentEventName = "";
     this.currentEventType = "";
     this.currentHandlers = {
@@ -334,9 +333,12 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
         return;
       }
       var lastEvent = this.eventQueue.shift();
-      if (this.touchCount === 0) {
+      if (this.canFindHandlers) {
         this.findEventHandlers(lastEvent);
       }
+      if (lastEvent.eventType === 'end') {
+        this.canFindHandlers = true;
+      }
       this.currentEventName = lastEvent.eventName;
       this.currentEventType = lastEvent.eventType;
       this.currentKey = this.currentTouch.key;
@@ -398,6 +400,7 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           this.clearStart();
           this.clearTouch();
           this.touchCount = this.countTouches(event);
+          this.canFindHandlers = false;
           if (this.preventDefault(tmodel, eventName)) {
             event.preventDefault();
           }
@@ -406,10 +409,6 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
           this.cursor.x = this.start0.x;
           this.cursor.y = this.start0.y;
           this.findEventHandlers(newEvent);
-          if (this.currentHandlers.touch) {
-            this.cursor.handlerX = this.start0.x - this.currentHandlers.touch.getX();
-            this.cursor.handlerY = this.start0.y - this.currentHandlers.touch.getY();
-          }
           event.stopPropagation();
           break;
         case 'mousemove':
@@ -495,7 +494,6 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       this.start1 = undefined;
       this.end0 = undefined;
       this.end1 = undefined;
-      this.touchCount = 0;
     }
   }, {
     key: "clearTouch",
@@ -518,6 +516,8 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       this.clearTouch();
       this.eventQueue.length = 0;
       this.touchTimeStamp = 0;
+      this.touchCount = 0;
+      this.canFindHandlers = true;
     }
   }, {
     key: "deltaX",
@@ -541,13 +541,13 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
     }
   }, {
     key: "swipeX",
-    value: function swipeX() {
-      return this.cursor.x - this.cursor.handlerX;
+    value: function swipeX(handler) {
+      return this.cursor.x - (this.start0.x - handler.getX());
     }
   }, {
     key: "swipeY",
-    value: function swipeY() {
-      return this.cursor.y - this.cursor.handlerY;
+    value: function swipeY(handler) {
+      return this.cursor.y - (this.start0.y - handler.getY());
     }
   }, {
     key: "pinchDelta",
@@ -725,6 +725,12 @@ var EventListener = exports.EventListener = /*#__PURE__*/function () {
       var handler = this.getTouchHandler();
       return target === handler || target.getParent() === handler;
     }
+  }, {
+    key: "isTouchHandlerOrChild",
+    value: function isTouchHandlerOrChild(target) {
+      var handler = this.getTouchHandler();
+      return target === handler || (handler === null || handler === void 0 ? void 0 : handler.getParent()) === target;
+    }
   }, {
     key: "countTouches",
     value: function countTouches(event) {

package/build/LocationManager.js

@@ -82,11 +82,11 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
         if (container.manageChildTargetExecution(child, shouldCalculateChildTargets)) {
           this.calculateTargets(child);
         }
-        viewport.setLocation();
         child.overflowingFlag = false;
         if (container.getContainerOverflowMode() === 'always' || child.getItemOverflowMode() === 'always' || container.getContainerOverflowMode() === 'auto' && child.getItemOverflowMode() === 'auto' && viewport.isOverflow()) {
           child.overflowingFlag = true;
           viewport.overflow();
+          viewport.setLocation();
         }
         if (child.isIncluded() && !this.hasLocationMap[child.oid]) {
           this.addToLocationList(child);

package/build/TModelManager.js

@@ -290,7 +290,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
           tmodel.$dom.attr(key, tmodel.val(key));
         } else {
           if (_TUtil.TUtil.isDefined(tmodel.val(key)) && tmodel.styleMap[key] !== tmodel.val(key)) {
-            tmodel.$dom.style(key, tmodel.val(key));
+            tmodel.$dom.style(key, "".concat(tmodel.val(key)));
             tmodel.styleMap[key] = tmodel.val(key);
           }
         }

package/build/TargetUtil.js

@@ -312,7 +312,6 @@ _defineProperty(TargetUtil, "styleWithUnitMap", {
   padding: true,
   left: true,
   top: true,
-  fontWeight: true,
   letterSpacing: true
 });
 _defineProperty(TargetUtil, "colorMap", {
@@ -343,7 +342,8 @@ _defineProperty(TargetUtil, "styleTargetMap", _objectSpread(_objectSpread(_objec
   fontFamily: true,
   overflow: true,
   textDecoration: true,
-  boxShadow: true
+  boxShadow: true,
+  fontWeight: true
 }));
 _defineProperty(TargetUtil, "scaleMap", {
   scale: true,
@@ -428,16 +428,16 @@ _defineProperty(TargetUtil, "targetConditionMap", {
     return (0, _App.getEvents)().getEventType() === 'click' && (0, _App.getEvents)().isClickHandler(tmodel);
   },
   onTouchStart: function onTouchStart(tmodel) {
-    return (0, _App.getEvents)().isStartEvent() && (0, _App.getEvents)().isTouchHandler(tmodel);
+    return (0, _App.getEvents)().isStartEvent() && (0, _App.getEvents)().isTouchHandlerOrChild(tmodel);
   },
-  onTouchEnd: function onTouchEnd() {
-    return (0, _App.getEvents)().isEndEvent();
+  onTouchEnd: function onTouchEnd(tmodel) {
+    return (0, _App.getEvents)().isEndEvent() && (0, _App.getEvents)().isTouchHandlerOrChild(tmodel);
   },
   onKeyEvent: function onKeyEvent() {
     return (0, _App.getEvents)().getEventType() === 'key' && (0, _App.getEvents)().currentKey;
   },
   onSwipeEvent: function onSwipeEvent(tmodel) {
-    return (0, _App.getEvents)().isTouchHandler(tmodel) && (0, _App.getEvents)().isSwipeEvent();
+    return (0, _App.getEvents)().isTouchHandlerOrChild(tmodel) && (0, _App.getEvents)().isSwipeEvent();
   },
   onAnySwipeEvent: function onAnySwipeEvent() {
     return (0, _App.getEvents)().isSwipeEvent();

package/build/Viewport.js

@@ -53,8 +53,6 @@ var Viewport = exports.Viewport = /*#__PURE__*/function () {
     value: function overflow() {
       this.xNext = this.scrollLeft - this.absX + this.xOverflowReset;
       this.yNext = this.ySouth;
-      this.currentChild.x = this.xNext + this.currentChild.getLeftMargin();
-      this.currentChild.y = this.yNext + this.currentChild.getTopMargin();
     }
   }, {
     key: "appendNewLine",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.113",
+  "version": "1.0.115",
   "keywords": [
     "targetj"
   ],