targetj 1.0.148 → 1.0.150

package/README.md

@@ -699,28 +699,31 @@ import { App, TModel, $Dom } from "targetj";
 App(new TModel("rows", {
     isVisible: true,
     containerOverflowMode: "always",
-    rectTop() { return this.$dom.getBoundingClientRect().top; },
-    absY() { return this.prevTargetValue - $Dom.getWindowScrollTop(); },
+    rectTop() { return this.$dom.getBoundingClientRect().top + $Dom.getWindowScrollTop(); },
+    absY() { return this.val('rectTop') - $Dom.getWindowScrollTop(); },
     defaultStyling: false,
     domHolder: true,
     onDomEvent: ["rectTop", "absY"],
     onWindowScroll: "absY",
     createRows: {
-        parallel: true,
-        cycles: 9,
-        value() {
-            const childrenLength = this.getChildren().length;
-            Array.from({length: 100}, (_, i) => {
-                this.addChild(new TModel("row", {
-                    keepEventDefault: true,
-                    height: 36,
-                    width: [{list: [100, 500, 200]}, 30],
-                    background: "#b388ff",
-                    canDeleteDom: false,
-                    html: `row ${i + childrenLength}`,
-                }));
-            });
-        }
+      parallel: true,
+      cycles: 9,
+      value() {
+        const childrenLength = this.getChildren().length;
+        Array.from({ length: 100 }, (_, i) => {
+          this.addChild(
+            new TModel("row", {
+              defaultStyling: false,
+              keepEventDefault: true,
+              height: 36,
+              width: [{ list: [100, 500, 200] }, 30],
+              background: "#b388ff",
+              canDeleteDom: false,
+              html: `row ${i + childrenLength}`,
+            })
+          );
+        });
+      }
     }
 }));
 ```

package/build/LoadingManager.js

@@ -273,6 +273,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
           targetName = _ref2.targetName;
         var key = "".concat(tmodel.oid, " ").concat(targetName);
         var tmodelEntry = _this4.tmodelKeyMap[key];
+        var loadTargetName = _this4.getLoadTargetName(targetName);
         if (!tmodelEntry) {
           return;
         }
@@ -283,8 +284,9 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
           order: fetchEntry.order,
           error: error
         };
-        var targetValue = tmodel.val(targetName);
-        targetValue[fetchEntry.order] = res;
+        var targetResults = tmodel.val(loadTargetName);
+        targetResults[fetchEntry.order] = res;
+        tmodel.val(targetName, targetResults.length === 1 ? targetResults[0] : targetResults);
         tmodelEntry.resultCount++;
         tmodelEntry.errorCount++;
         _this4.callOnErrorHandler(tmodel, targetName);

package/build/LocationManager.js

@@ -122,8 +122,6 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
       var shouldCalculateChildTargets = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       var allChildrenList = this.getChildren(container);
       var viewport = container.createViewport();
-      var contentWidth = container.getContentWidth();
-      var contentHeight = container.getContentHeight();
       container.visibleChildren.length = 0;
       var _iterator = _createForOfIteratorHelper(allChildrenList),
         _step;
@@ -209,9 +207,6 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
         _iterator.f();
       }
       container.calcContentWidthHeight();
-      if (contentWidth !== container.getContentWidth() || contentHeight !== container.getContentHeight()) {
-        this.runEventTargets(container, 'onContentResize');
-      }
       var _iterator2 = _createForOfIteratorHelper(allChildrenList),
         _step2;
       try {
@@ -276,16 +271,20 @@ var LocationManager = exports.LocationManager = /*#__PURE__*/function () {
       if (!Array.isArray(eventTargets)) {
         eventTargets = [eventTargets];
       }
-      var originalTarget = (0, _App.getEvents)().getEventTarget();
+      var originalEventTarget = (0, _App.getEvents)().getEventTarget();
       eventTargets.forEach(function (targetName) {
         var target = tmodel.targets[targetName];
         if (tmodel.isTargetEnabled(targetName)) {
           if (typeof target.value === 'function') {
-            target.value.call(tmodel, originalTarget);
+            target.value.call(tmodel, originalEventTarget);
           } else if (Array.isArray(target.value)) {
             target.value.forEach(function (t) {
               return _TargetUtil.TargetUtil.activateSingleTarget(tmodel, t);
             });
+          } else if (Array.isArray(target)) {
+            target.forEach(function (t) {
+              return _TargetUtil.TargetUtil.activateSingleTarget(tmodel, t);
+            });
           } else {
             _TargetUtil.TargetUtil.activateSingleTarget(tmodel, target.value);
           }

package/build/TModelManager.js

@@ -255,6 +255,7 @@ var TModelManager = exports.TModelManager = /*#__PURE__*/function () {
           tmodel.styleMap = {};
           tmodel.transformMap = {};
           tmodel.val('isVisible', false);
+          tmodel.hasDomNow = false;
           (_tmodel$$dom4 = tmodel.$dom) === null || _tmodel$$dom4 === void 0 || _tmodel$$dom4.detach();
           tmodel.$dom = null;
         }

package/build/TargetData.js

@@ -177,6 +177,8 @@ _defineProperty(TargetData, "controlTargetMap", {
   styling: true,
   reuseDomDefinition: true,
   useWindowFrame: true,
+  canDeleteDom: true,
+  domHolder: true,
   interval: true,
   onDomEvent: true,
   canHaveDom: true

package/build/TargetUtil.js

@@ -172,8 +172,11 @@ var TargetUtil = exports.TargetUtil = /*#__PURE__*/function () {
         }
         return;
       }
-      if (target && cleanTargetName) {
+      if (target && cleanTargetName && !tmodel.isTargetImperative(key)) {
         if (isEndTrigger && TargetUtil.hasTargetEnded(tmodel, key) || !isEndTrigger) {
+          if (tmodel.oid === 'explosion') {
+            console.log("activating: " + tmodel.oid + ", " + key + ", " + cleanTargetName);
+          }
           TargetUtil.activateNextTarget(tmodel, cleanTargetName);
         }
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.148",
+  "version": "1.0.150",
   "keywords": [
     "targetjs"
   ],