targetj 1.0.174 → 1.0.176

package/README.md

@@ -51,7 +51,29 @@ Or in HTML (no JavaScript required), using tg- attributes that mirror object lit
    tg-width="[{ list: [100, 250, 100] }, 50, 10]"
    tg-height$="return this.prevTargetValue / 2;">
 </div>
-``` 
+```
+Or a combination of JavaScript and HTML, linked together using the same HTML ID. In the example below, both the object and the `<div>` element are bound using the ID 'box'. The object uses the `<div>` as its base element, combining the background from the element with the width and height from the object:
+
+```javascript
+import { App } from "targetj";
+
+App({
+    id: 'box',
+    width: [{ list: [100, 250, 100] }, 50, 10],
+    _height$() {
+      return this.prevTargetValue / 2;
+    } 
+});
+```
+
+```html 
+<div
+   id="box"
+   tg-background="mediumpurple"
+</div>
+```
+
+
 
 ### Simple Loading API Example
 

package/build/BaseModel.js

@@ -31,6 +31,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
   function BaseModel(type, targets, oid) {
+    var _targets;
     _classCallCheck(this, BaseModel);
     if (_typeof(type) === 'object' && typeof targets === 'undefined') {
       targets = type;
@@ -47,7 +48,12 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
       this.oid = oid;
       this.oidNum = 0;
     }
-    _App.App.tmodelIdMap[this.oid] = this;
+    if (!((_targets = targets) !== null && _targets !== void 0 && _targets.sourceDom) && _TUtil.TUtil.isDefined(oid)) {
+      this.originalId = oid;
+    }
+    if (!_App.App.tmodelIdMap[this.oid]) {
+      _App.App.tmodelIdMap[this.oid] = this;
+    }
     this._state = {};
   }
   return _createClass(BaseModel, [{
@@ -262,6 +268,12 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     key: "initTargets",
     value: function initTargets() {
       var _this = this;
+      this.originalTargetNames = Object.keys(this.targets);
+      if (_TUtil.TUtil.isDefined(this.originalId) && (0, _App.getDomTModelById)(this.originalId)) {
+        _TUtil.TUtil.mergeTargets((0, _App.getDomTModelById)(this.originalId), this);
+        this.toDiscard = true;
+        return;
+      }
       this.actualValues = _TModelUtil.TModelUtil.defaultActualValues();
       this.targetValues = {};
       this.activeTargetMap = {};

package/build/LoadingManager.js

@@ -74,7 +74,7 @@ var LoadingManager = exports.LoadingManager = /*#__PURE__*/function () {
       var _this = this;
       var urls = Array.isArray(url) ? url : [url];
       urls.forEach(function (singleUrl) {
-        var fetchId = "".concat(tmodel.oid, "_").concat(singleUrl, "_").concat(JSON.stringify(query));
+        var fetchId = query ? "".concat(tmodel.oid, "_").concat(singleUrl, "_").concat(JSON.stringify(query)) : "".concat(tmodel.oid, "_").concat(singleUrl);
         _this.fetchCommon(fetchId, cacheId, tmodel, _this.fetchingAPIMap, function () {
           _this.ajaxAPI(singleUrl, query, _this.fetchingAPIMap[fetchId]);
         });

package/build/TModel.js

@@ -134,33 +134,31 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
           var foundKey = Object.keys(this.actualValues).find(function (key) {
             return _this2.actualValues[key] === child;
           });
-          var originalId = child.id;
           if (foundKey) {
             child = new TModel(child.id || foundKey, child);
             this.actualValues[foundKey] = child;
           } else if (_TUtil.TUtil.isDefined(child.otype)) {
             child = new TModel(child.otype, child);
           } else if (_TUtil.TUtil.isDefined(child.id)) {
-            child = new TModel(child.id, child, child.sourceDom ? child.id : undefined);
+            child = new TModel(child.id, child, child.id);
           } else {
             child = new TModel("".concat(this.oid, "_"), child);
           }
-          if (!child.targets['sourceDom'] && _TUtil.TUtil.isDefined(originalId)) {
-            child.originalId = originalId;
-          }
-        }
-        this.addedChildren.push({
-          index: index,
-          child: child
-        });
-        child.parent = this;
-        if (child.updatingTargetList.length > 0) {
-          this.addToUpdatingChildren(child);
         }
-        if (child.activeTargetList.length > 0) {
-          this.addToActiveChildren(child);
+        if (!child.toDiscard) {
+          this.addedChildren.push({
+            index: index,
+            child: child
+          });
+          child.parent = this;
+          if (child.updatingTargetList.length > 0) {
+            this.addToUpdatingChildren(child);
+          }
+          if (child.activeTargetList.length > 0) {
+            this.addToActiveChildren(child);
+          }
+          child.activate();
         }
-        child.activate();
       }
       return this;
     }
@@ -190,10 +188,6 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
         this.addedChildren.forEach(function (_ref) {
           var index = _ref.index,
             child = _ref.child;
-          if (_TUtil.TUtil.isDefined(child.originalId) && (0, _App.getDomTModelById)(child.originalId) && !child.targets['sourceDom']) {
-            _TUtil.TUtil.mergeTargets((0, _App.getDomTModelById)(child.originalId), child);
-            return;
-          }
           if (_this3.allChildrenMap[child.oid]) {
             return;
           }

package/build/TUtil.js

@@ -217,14 +217,21 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
   }, {
     key: "mergeTargets",
     value: function mergeTargets(tmodel1, tmodel2) {
+      var _tmodel1$originalTarg;
       var sourceTargets = tmodel2.targets;
+      var targetNames = tmodel2.originalTargetNames;
       var destTargets = tmodel1.targets;
-      Object.keys(sourceTargets).forEach(function (key) {
+      var newTargets = [];
+      targetNames.forEach(function (key) {
         if (!TUtil.isDefined(destTargets[key])) {
-          destTargets[key] = sourceTargets[key];
-          tmodel1.processNewTarget(key);
+          newTargets.push(key);
         }
       });
+      (_tmodel1$originalTarg = tmodel1.originalTargetNames).push.apply(_tmodel1$originalTarg, newTargets);
+      newTargets.forEach(function (key) {
+        destTargets[key] = sourceTargets[key];
+        tmodel1.processNewTarget(key);
+      });
     }
   }]);
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.174",
+  "version": "1.0.176",
   "description": "TargetJS is a JavaScript framework designed for creating animated and efficient web user interfaces.",
   "keywords": ["targetjs"],
   "main": "Export.js",