targetj 1.0.170 → 1.0.171

package/build/App.js

@@ -4,7 +4,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tRoot = exports.tApp = exports.isRunning = exports.getVisibles = exports.getScreenWidth = exports.getScreenHeight = exports.getRunScheduler = exports.getResizeLastUpdate = exports.getPager = exports.getManager = exports.getLocationManager = exports.getLoader = exports.getEvents = exports.getBrowser = exports.fetchImage = exports.fetch = exports.App = void 0;
+exports.tRoot = exports.tApp = exports.isRunning = exports.getVisibles = exports.getTModelById = exports.getScreenWidth = exports.getScreenHeight = exports.getRunScheduler = exports.getResizeLastUpdate = exports.getPager = exports.getManager = exports.getLocationManager = exports.getLoader = exports.getEvents = exports.getDomTModelById = exports.getBrowser = exports.fetchImage = exports.fetch = exports.App = void 0;
 var _$Dom = require("./$Dom.js");
 var _TModel = require("./TModel.js");
 var _Browser = require("./Browser.js");
@@ -23,6 +23,11 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 var tApp;
+var queuedAppCall = null;
+document.addEventListener("DOMContentLoaded", function () {
+  exports.tApp = tApp = AppFn();
+  tApp.init().start();
+});
 var AppFn = function AppFn() {
   var my = {};
   my.throttle = 0;
@@ -67,6 +72,10 @@ var AppFn = function AppFn() {
         },
         initPageDom: function initPageDom() {
           _DomInit.DomInit.initPageDoms(this.$dom);
+          if (queuedAppCall) {
+            this.addChild(queuedAppCall);
+            queuedAppCall = undefined;
+          }
         }
       });
       tmodel.$dom = _$Dom.$Dom.query('#tgjs-root') ? new _$Dom.$Dom('#tgjs-root') : new _$Dom.$Dom('body');
@@ -154,17 +163,16 @@ var AppFn = function AppFn() {
   return my;
 };
 var App = exports.App = function App(firstChild) {
-  if (tApp) {
-    if (firstChild) {
-      tApp.tRoot.addChild(firstChild);
-      tApp.runScheduler.schedule(0, "appStart");
-    }
-  } else {
-    exports.tApp = tApp = AppFn();
-    tApp.init().start();
+  var _tApp;
+  if (!((_tApp = tApp) !== null && _tApp !== void 0 && _tApp.tRoot)) {
+    queuedAppCall = firstChild;
+  } else if (firstChild) {
+    var _tApp2;
+    (_tApp2 = tApp) === null || _tApp2 === void 0 || _tApp2.tRoot.addChild(firstChild);
   }
 };
 App.oids = {};
+App.tmodelIdMap = {};
 App.getOid = function (type) {
   var oids = App.oids;
   if (!_TUtil.TUtil.isDefined(oids[type])) {
@@ -176,64 +184,70 @@ App.getOid = function (type) {
     num: num
   };
 };
-App();
 var isRunning = exports.isRunning = function isRunning() {
   return tApp ? tApp.runningFlag : false;
 };
 var tRoot = exports.tRoot = function tRoot() {
-  var _tApp;
-  return (_tApp = tApp) === null || _tApp === void 0 ? void 0 : _tApp.tRoot;
+  var _tApp3;
+  return (_tApp3 = tApp) === null || _tApp3 === void 0 ? void 0 : _tApp3.tRoot;
 };
 var getEvents = exports.getEvents = function getEvents() {
-  var _tApp2;
-  return (_tApp2 = tApp) === null || _tApp2 === void 0 ? void 0 : _tApp2.events;
+  var _tApp4;
+  return (_tApp4 = tApp) === null || _tApp4 === void 0 ? void 0 : _tApp4.events;
 };
 var getPager = exports.getPager = function getPager() {
-  var _tApp3;
-  return (_tApp3 = tApp) === null || _tApp3 === void 0 ? void 0 : _tApp3.pager;
+  var _tApp5;
+  return (_tApp5 = tApp) === null || _tApp5 === void 0 ? void 0 : _tApp5.pager;
 };
 var getLoader = exports.getLoader = function getLoader() {
-  var _tApp4;
-  return (_tApp4 = tApp) === null || _tApp4 === void 0 ? void 0 : _tApp4.loader;
+  var _tApp6;
+  return (_tApp6 = tApp) === null || _tApp6 === void 0 ? void 0 : _tApp6.loader;
 };
 var fetch = exports.fetch = function fetch(tmodel, url, query, cacheId) {
-  var _tApp5;
-  return (_tApp5 = tApp) === null || _tApp5 === void 0 || (_tApp5 = _tApp5.loader) === null || _tApp5 === void 0 ? void 0 : _tApp5.fetch(tmodel, url, query, cacheId);
+  var _tApp7;
+  return (_tApp7 = tApp) === null || _tApp7 === void 0 || (_tApp7 = _tApp7.loader) === null || _tApp7 === void 0 ? void 0 : _tApp7.fetch(tmodel, url, query, cacheId);
 };
 var fetchImage = exports.fetchImage = function fetchImage(tmodel, src, cacheId) {
-  var _tApp6;
-  return (_tApp6 = tApp) === null || _tApp6 === void 0 || (_tApp6 = _tApp6.loader) === null || _tApp6 === void 0 ? void 0 : _tApp6.fetchImage(tmodel, src, cacheId);
+  var _tApp8;
+  return (_tApp8 = tApp) === null || _tApp8 === void 0 || (_tApp8 = _tApp8.loader) === null || _tApp8 === void 0 ? void 0 : _tApp8.fetchImage(tmodel, src, cacheId);
 };
 var getManager = exports.getManager = function getManager() {
-  var _tApp7;
-  return (_tApp7 = tApp) === null || _tApp7 === void 0 ? void 0 : _tApp7.manager;
+  var _tApp9;
+  return (_tApp9 = tApp) === null || _tApp9 === void 0 ? void 0 : _tApp9.manager;
 };
 var getRunScheduler = exports.getRunScheduler = function getRunScheduler() {
-  var _tApp8;
-  return (_tApp8 = tApp) === null || _tApp8 === void 0 ? void 0 : _tApp8.runScheduler;
+  var _tApp10;
+  return (_tApp10 = tApp) === null || _tApp10 === void 0 ? void 0 : _tApp10.runScheduler;
 };
 var getLocationManager = exports.getLocationManager = function getLocationManager() {
-  var _tApp9;
-  return (_tApp9 = tApp) === null || _tApp9 === void 0 ? void 0 : _tApp9.locationManager;
+  var _tApp11;
+  return (_tApp11 = tApp) === null || _tApp11 === void 0 ? void 0 : _tApp11.locationManager;
 };
 var getBrowser = exports.getBrowser = function getBrowser() {
-  var _tApp10;
-  return (_tApp10 = tApp) === null || _tApp10 === void 0 ? void 0 : _tApp10.browser;
+  var _tApp12;
+  return (_tApp12 = tApp) === null || _tApp12 === void 0 ? void 0 : _tApp12.browser;
 };
 var getScreenWidth = exports.getScreenWidth = function getScreenWidth() {
-  var _tApp$tRoot$val, _tApp11;
-  return (_tApp$tRoot$val = (_tApp11 = tApp) === null || _tApp11 === void 0 || (_tApp11 = _tApp11.tRoot) === null || _tApp11 === void 0 ? void 0 : _tApp11.val('screenWidth')) !== null && _tApp$tRoot$val !== void 0 ? _tApp$tRoot$val : 0;
+  var _tApp$tRoot$val, _tApp13;
+  return (_tApp$tRoot$val = (_tApp13 = tApp) === null || _tApp13 === void 0 || (_tApp13 = _tApp13.tRoot) === null || _tApp13 === void 0 ? void 0 : _tApp13.val('screenWidth')) !== null && _tApp$tRoot$val !== void 0 ? _tApp$tRoot$val : 0;
 };
 var getScreenHeight = exports.getScreenHeight = function getScreenHeight() {
-  var _tApp$tRoot$val2, _tApp12;
-  return (_tApp$tRoot$val2 = (_tApp12 = tApp) === null || _tApp12 === void 0 || (_tApp12 = _tApp12.tRoot) === null || _tApp12 === void 0 ? void 0 : _tApp12.val('screenHeight')) !== null && _tApp$tRoot$val2 !== void 0 ? _tApp$tRoot$val2 : 0;
+  var _tApp$tRoot$val2, _tApp14;
+  return (_tApp$tRoot$val2 = (_tApp14 = tApp) === null || _tApp14 === void 0 || (_tApp14 = _tApp14.tRoot) === null || _tApp14 === void 0 ? void 0 : _tApp14.val('screenHeight')) !== null && _tApp$tRoot$val2 !== void 0 ? _tApp$tRoot$val2 : 0;
 };
 var getVisibles = exports.getVisibles = function getVisibles() {
-  var _tApp13;
-  return (_tApp13 = tApp) === null || _tApp13 === void 0 || (_tApp13 = _tApp13.manager) === null || _tApp13 === void 0 ? void 0 : _tApp13.lists.visible;
+  var _tApp15;
+  return (_tApp15 = tApp) === null || _tApp15 === void 0 || (_tApp15 = _tApp15.manager) === null || _tApp15 === void 0 ? void 0 : _tApp15.lists.visible;
 };
 var getResizeLastUpdate = exports.getResizeLastUpdate = function getResizeLastUpdate() {
-  var _tApp14;
-  return (_tApp14 = tApp) === null || _tApp14 === void 0 ? void 0 : _tApp14.resizeLastUpdate;
+  var _tApp16;
+  return (_tApp16 = tApp) === null || _tApp16 === void 0 ? void 0 : _tApp16.resizeLastUpdate;
+};
+var getTModelById = exports.getTModelById = function getTModelById(id) {
+  return App.tmodelIdMap[id];
+};
+var getDomTModelById = exports.getDomTModelById = function getDomTModelById(id) {
+  var tmodel = App.tmodelIdMap[id];
+  return tmodel && tmodel.targets['sourceDom'] ? tmodel : undefined;
 };
-window.t = window.t || _SearchUtil.SearchUtil.find;
+window.t = window.t || getTModelById;

package/build/BaseModel.js

@@ -38,14 +38,16 @@ var BaseModel = exports.BaseModel = /*#__PURE__*/function () {
     }
     this.type = type || 'blank';
     this.targets = Object.assign({}, targets);
-    if (!oid) {
+    if (!_TUtil.TUtil.isDefined(oid)) {
       var uniqueId = _App.App.getOid(this.type);
       this.oid = uniqueId.oid;
       this.oidNum = uniqueId.num;
     } else {
+      _App.App.getOid(oid);
       this.oid = oid;
       this.oidNum = 0;
     }
+    _App.App.tmodelIdMap[this.oid] = this;
     this._state = {};
   }
   return _createClass(BaseModel, [{

package/build/DomInit.js

@@ -157,6 +157,7 @@ var DomInit = exports.DomInit = /*#__PURE__*/function () {
             _value.$dom.detach();
             delete _value.$dom;
             delete _value.id;
+            _value.sourceDom = true;
             _value.shouldBeBracketed = false;
             _value.otype = _value.id || (_parentModel.id || _App.App.getOid('blank').oid) + "_";
             _value.isVisible = !_TUtil.TUtil.isDefined(_value.isVisible) ? function () {

package/build/PageManager.js

@@ -59,12 +59,14 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
                 _App.tApp.tRoot.$dom.innerHTML("");
                 _App.tApp.tRoot = _App.tApp.tRootFactory();
                 _App.App.oids = {};
+                _App.App.tmodelIdMap = {};
                 _App.tApp.pageIsEmpty = true;
                 this.lastLink = link;
                 _App.tApp.start();
               } else {
                 _App.tApp.tRoot = this.pageCache[link].tRoot;
                 _App.App.oids = this.pageCache[link].oids;
+                _App.App.tmodelIdMap = this.pageCache[link].tmodelIdMap;
                 _App.tApp.tRoot.$dom = _$Dom.$Dom.query('#tgjs-root') ? new _$Dom.$Dom('#tgjs-root') : new _$Dom.$Dom('body');
                 _App.tApp.tRoot.$dom.innerHTML(this.pageCache[link].html);
                 _DomInit.DomInit.initCacheDoms(this.pageCache[link].visibleList);
@@ -121,6 +123,7 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
           link: this.lastLink,
           html: html,
           oids: _objectSpread({}, _App.App.oids),
+          tmodelIdMap: _objectSpread({}, _App.App.tmodelIdMap),
           visibleList: _toConsumableArray(_App.tApp.manager.lists.visible),
           tRoot: _App.tApp.tRoot
         };
@@ -141,6 +144,7 @@ var PageManager = exports.PageManager = /*#__PURE__*/function () {
         link: document.URL,
         html: _App.tApp.tRoot.$dom.innerHTML(),
         oids: _objectSpread({}, _App.App.oids),
+        tmodelIdMap: _objectSpread({}, _App.App.tmodelIdMap),
         visibleList: _toConsumableArray(_App.tApp.manager.lists.visible),
         tRoot: _App.tApp.tRoot
       };

package/build/TModel.js

@@ -95,6 +95,33 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       this.absX = _TUtil.TUtil.isDefined(this.val('absX')) ? this.val('absX') : this.getParent().absX + x;
       this.absY = _TUtil.TUtil.isDefined(this.val('absY')) ? this.val('absY') : this.getParent().absY + y;
     }
+  }, {
+    key: "removeChild",
+    value: function removeChild(child) {
+      if (!child) {
+        return;
+      }
+      this.deletedChildren.push(child);
+      this.removeFromUpdatingChildren(child);
+      this.childrenUpdateFlag = true;
+      (0, _App.getRunScheduler)().schedule(1, 'removeChild-' + this.oid + "-" + child.oid);
+      return this;
+    }
+  }, {
+    key: "moveChild",
+    value: function moveChild(child, index) {
+      this.movedChildren.push({
+        index: index,
+        child: child
+      });
+      if (child.hasDom() && child.requiresDomRelocation()) {
+        child.domOrderIndex = index;
+        child.activate();
+      }
+      this.childrenUpdateFlag = true;
+      (0, _App.getRunScheduler)().schedule(1, 'moveChild-' + this.oid + "-" + child.oid);
+      return this;
+    }
   }, {
     key: "addChild",
     value: function addChild(child) {
@@ -107,16 +134,20 @@ 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.id);
+            child = new TModel(child.id, child, child.sourceDom ? child.id : undefined);
           } else {
             child = new TModel("".concat(this.oid, "_"), child);
           }
+          if (!child.targets['sourceDom'] && _TUtil.TUtil.isDefined(originalId)) {
+            child.originalId = originalId;
+          }
         }
         this.addedChildren.push({
           index: index,
@@ -133,33 +164,6 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
       }
       return this;
     }
-  }, {
-    key: "removeChild",
-    value: function removeChild(child) {
-      if (!child) {
-        return;
-      }
-      this.deletedChildren.push(child);
-      this.removeFromUpdatingChildren(child);
-      this.childrenUpdateFlag = true;
-      (0, _App.getRunScheduler)().schedule(1, 'removeChild-' + this.oid + "-" + child.oid);
-      return this;
-    }
-  }, {
-    key: "moveChild",
-    value: function moveChild(child, index) {
-      this.movedChildren.push({
-        index: index,
-        child: child
-      });
-      if (child.hasDom() && child.requiresDomRelocation()) {
-        child.domOrderIndex = index;
-        child.activate();
-      }
-      this.childrenUpdateFlag = true;
-      (0, _App.getRunScheduler)().schedule(1, 'moveChild-' + this.oid + "-" + child.oid);
-      return this;
-    }
   }, {
     key: "getChildren",
     value: function getChildren() {
@@ -186,6 +190,10 @@ 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;
           }
@@ -642,12 +650,12 @@ var TModel = exports.TModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getCenterX",
     value: function getCenterX() {
-      return (this.getParentValue('width') - this.getWidth()) / 2;
+      return _TUtil.TUtil.isDefined(this.getParentValue('width')) ? (this.getParentValue('width') - this.getWidth()) / 2 : 0;
     }
   }, {
     key: "getCenterY",
     value: function getCenterY() {
-      return (this.getParentValue('height') - this.getHeight()) / 2;
+      return _TUtil.TUtil.isDefined(this.getParentValue('height')) ? (this.getParentValue('height') - this.getHeight()) / 2 : 0;
     }
   }, {
     key: "getX",

package/build/TUtil.js

@@ -214,5 +214,17 @@ var TUtil = exports.TUtil = /*#__PURE__*/function () {
         _iterator.f();
       }
     }
+  }, {
+    key: "mergeTargets",
+    value: function mergeTargets(tmodel1, tmodel2) {
+      var sourceTargets = tmodel2.targets;
+      var destTargets = tmodel1.targets;
+      Object.keys(sourceTargets).forEach(function (key) {
+        if (!TUtil.isDefined(destTargets[key])) {
+          destTargets[key] = sourceTargets[key];
+          tmodel1.processNewTarget(key);
+        }
+      });
+    }
   }]);
 }();

package/package.json

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