targetj 1.0.54 → 1.0.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.54",
+  "version": "1.0.55",
   "keywords": [
     "targetj"
   ],

package/src/App.js

@@ -13,7 +13,7 @@ import { TargetManager } from "./TargetManager.js";
 
 var tapp;
 
-function AppFn(tmodel) { 
+function AppFn(firstChild) { 
         
     function my() {} 
     
@@ -44,33 +44,32 @@ function AppFn(tmodel) {
         my.targetManager = new TargetManager();
         my.manager = new TModelManager();
         
-        my.uiFactory = function() {
-
-            var tmodel = new TModel('targetj', {
-                domCreatedBySelector: true,
-                domHolder: {
-                    value: function() {
-                        return this.getDomHolder();
-                    },
-                    enabledOn: function() {
-                        return this.getDomHolder();
-                    }
-                },
-                canHaveDom: false
-            });
+        my.tjRootFactory = function() {
+            
+            var tjRoot = new TModel('targetj');
                         
-            tmodel.addChild = function(child, index) {  
-                child.addTargets({
-                    domCreatedBySelector: true,
-                    domHolder: {
+            tjRoot.addChild = function(child, index) {
+                if (!TUtil.isDefined(child.targets['domHolder'])) {
+                    child.addTarget('domHolder', {
                         value: function() {
-                            return this.getDomHolder();
-                        },
-                        enabledOn: function() {
-                            return this.getDomHolder();
+                            var $dom;
+                            if (!$Dom.query('#tj-root')) {
+                                $dom = new $Dom();            
+                                $dom.create('div');
+                                $dom.setSelector('#tj-root');
+                                $dom.setId('#tj-root');
+                                $dom.attr("tabindex", "0");
+                                new $Dom('body').insertFirst$Dom($dom);            
+                            } else {
+                                $dom = new $Dom('#tj-root');
+                            }
+                            return $dom;
                         }
-                    },
-                    addEventHandler: {
+                    });
+                }
+                
+                if (!TUtil.isDefined(child.targets['addEventHandler'])) {                
+                    child.addTarget('addEventHandler', {
                         value: function() {
                             my.events.removeHandlers(this.$dom);
                             my.events.addHandlers(this.$dom);
@@ -81,27 +80,29 @@ function AppFn(tmodel) {
                         enabledOn: function() {
                             return this.hasDom();
                         }
-                    }
-                }); 
+                    });
+                }
                 
-                TModel.prototype.addChild.call(tmodel, child, index);  
+                TModel.prototype.addChild.call(tjRoot, child, index);  
             };
-            
-   
-            if (my.ui) {
-                my.ui.getChildren().forEach(function(t, index) {
-                    delete App.oids[t.type];
-                    tmodel.addChild(new TModel(t.type, t.targets));
+                        
+            if (my.tjRoot) {
+                my.tjRoot.getChildren().forEach(function(t, num) {
+                    var child = new TModel(t.type, t.targets);
+                    child.oidNum = num;
+                    child.oid = num > 0 ? t.type + num : t.type;
+                    tjRoot.addChild(child);
                 });
             }
             
-            return tmodel;
+            return tjRoot;
         };
         
 
-        my.ui = my.uiFactory();
-        if (tmodel) {
-            my.ui.addChild(tmodel);
+        my.tjRoot = my.tjRootFactory();
+        
+        if (firstChild) {
+            my.tjRoot.addChild(firstChild);
         }
         
         window.history.pushState({ link: document.URL }, "", document.URL);                
@@ -113,7 +114,7 @@ function AppFn(tmodel) {
         my.runningFlag = false; 
         
         my.events.clear();
-        my.ui.getChildren().forEach(function(child) {
+        my.tjRoot.getChildren().forEach(function(child) {
             child.deleteTargetValue('addEventHandler');
         });        
                         
@@ -130,7 +131,7 @@ function AppFn(tmodel) {
     my.stop = function()    { 
         my.runningFlag = false;
 
-        my.ui.getChildren().forEach(function(child) {
+        my.tjRoot.getChildren().forEach(function(child) {
             if (child.hasDom()) {
                 my.events.removeHandlers(child.$dom);
             }
@@ -186,8 +187,8 @@ function isRunning() {
     return tapp ? tapp.runningFlag : false;
 };
 
-function ui() {
-    return tapp ? tapp.ui : null;
+function tjRoot() {
+    return tapp ? tapp.tjRoot : null;
 }
 
 function getEvents() {
@@ -226,4 +227,4 @@ App.getOid = function(type) {
     return { oid: num > 0 ? type + num : type, num: num };
 };
 
-export { tapp, App, isRunning, ui, getEvents, getPager, getLoader, getManager, $Dom, getScreenWidth, getScreenHeight };
+export { tapp, App, tjRoot, isRunning, getEvents, getPager, getLoader, getManager, $Dom, getScreenWidth, getScreenHeight };

package/src/EventListener.js

@@ -101,7 +101,7 @@ EventListener.prototype.handleEvent = function (event) {
 
     this.eventTagName = (event.target.tagName || "").toUpperCase();
     this.eventName = this.eventMap[event.type];
-    
+        
     switch (this.eventName) { 
         
         case 'mousedown':

package/src/LocationManager.js

@@ -22,8 +22,8 @@ LocationManager.prototype.calculateAll = function() {
 };
 
 LocationManager.prototype.calculate = function() {                   
-    this.addToLocationList(tapp.ui);
-    this.calculateContainer(tapp.ui);
+    this.addToLocationList(tapp.tjRoot);
+    this.calculateContainer(tapp.tjRoot);
 };
 
 LocationManager.prototype.getChildren = function(container) {

package/src/PageManager.js

@@ -15,13 +15,13 @@ PageManager.prototype.openPage = function(link) {
     var self = this;
 
     if (!this.pageCache[link]) {
-        tapp.ui.getChildren().forEach(function(child) { child.$dom.innerHTML(""); });
-        tapp.ui = tapp.uiFactory();
+        tapp.tjRoot.getChildren().forEach(function(child) { child.$dom.innerHTML(""); });
+        tapp.tjRoot = tapp.tjRootFactory();
         self.lastLink = link;        
         setTimeout(tapp.start);  
     } else {
-        tapp.ui = this.pageCache[link].ui;
-        tapp.ui.getChildren().forEach(function(child, index) {
+        tapp.tjRoot = this.pageCache[link].tjRoot;
+        tapp.tjRoot.getChildren().forEach(function(child, index) {
             child.$dom.innerHTML(self.pageCache[link].htmls[index]); 
         });        
         
@@ -50,9 +50,9 @@ PageManager.prototype.openLink = function(link) {
     if (this.lastLink) {
         this.pageCache[this.lastLink] = { 
             link: this.lastLink, 
-            htmls: tapp.ui.getChildren().map(function(child) { return child.$dom.innerHTML(); }), 
+            htmls: tapp.tjRoot.getChildren().map(function(child) { return child.$dom.innerHTML(); }), 
             visibleList: tapp.manager.lists.visible.slice(0),
-            ui: tapp.ui 
+            tjRoot: tapp.tjRoot 
         };
     }
     
@@ -69,9 +69,9 @@ PageManager.prototype.updateBrowserUrl = function(link) {
     if (!currentState.browserUrl) {
         this.pageCache[document.URL] = { 
             link: document.URL, 
-            htmls: tapp.ui.getChildren().map(function(child) { return child.$dom.innerHTML(); }), 
+            htmls: tapp.tjRoot.getChildren().map(function(child) { return child.$dom.innerHTML(); }), 
             visibleList: tapp.manager.lists.visible.slice(0),
-            ui: tapp.ui 
+            tjRoot: tapp.tjRoot 
         };
         history.pushState({ browserUrl: link }, "", link);
     } else {

package/src/SearchUtil.js

@@ -112,7 +112,7 @@ SearchUtil.findByType = function (type) {
     }
     
     if (!TUtil.isDefined(SearchUtil.foundTypeMap[type])) {
-        tmodel = search(tapp.ui);  
+        tmodel = search(tapp.tjRoot);  
         if (tmodel) {
             SearchUtil.foundTypeMap[type] = tmodel;
         }
@@ -146,7 +146,7 @@ SearchUtil.findByTarget = function (target) {
     }
     
     if (!TUtil.isDefined(SearchUtil.foundTargetMap[target])) {
-        tmodel = search(tapp.ui);  
+        tmodel = search(tapp.tjRoot);  
         if (tmodel) {
             SearchUtil.foundTargetMap[target] = tmodel;
         }
@@ -179,7 +179,7 @@ SearchUtil.find = function (oid) {
     }
        
     if (!TUtil.isDefined(SearchUtil.foundOids[oid])) {
-        tmodel = search(tapp.ui);  
+        tmodel = search(tapp.tjRoot);  
         if (tmodel) {
             SearchUtil.foundOids[oid] = tmodel;
         }

package/src/TModel.js

@@ -50,8 +50,6 @@ function TModel(type, targets) {
         allChildren: [],
         isInFlow: true,
         canHaveDom: true,
-        domSelector: '#tpage',
-        domCreatedBySelector: false,
         canHandleEvents: false,
         widthFromDom: false,
         heightFromDom: false,
@@ -110,25 +108,7 @@ TModel.prototype.getDomParent = function() {
 };
 
 TModel.prototype.getDomHolder = function() {
-    var $dom;
-    
-    if (this.getValue('domCreatedBySelector')) {
-
-        if (!$Dom.query(this.getValue('domSelector'))) {
-            $dom = new $Dom();            
-            $dom.create('div');
-            $dom.setSelector(this.getValue('domSelector'));
-            $dom.setId(this.getValue('domSelector'));
-            $dom.attr("tabindex", "0");
-            new $Dom('body').insertFirst$Dom($dom);            
-        } else {
-            $dom = new $Dom(this.getValue('domSelector'));
-        }
-    } else {
-        $dom = this.actualValues.domHolder ? this.actualValues.domHolder : this.getDomParent() ? this.getDomParent().$dom : SearchUtil.findParentWithTarget(this, 'domHolder') ? SearchUtil.findParentWithTarget(this, 'domHolder').$dom : null;
-    }
-    
-    return $dom;
+    return this.actualValues.domHolder ? this.actualValues.domHolder : this.getDomParent() ? this.getDomParent().$dom : SearchUtil.findParentWithTarget(this, 'domHolder') ? SearchUtil.findParentWithTarget(this, 'domHolder').$dom : null;
 };
 
 TModel.prototype.resetActiveTargetMap = function() {

package/src/TModelManager.js

@@ -322,7 +322,7 @@ TModelManager.prototype.run = function(oid, delay) {
                     
                     tapp.targetManager.doneTargets.length = 0;
 
-                    tapp.locationManager.calculateTargets(tapp.ui);
+                    tapp.locationManager.calculateTargets(tapp.tjRoot);
 
                     tapp.locationManager.calculateAll();
                     

package/webpack.config.js

@@ -7,7 +7,7 @@ module.exports = {
       name: 'TargetJ',
       type: 'window'
     },
-    path: path.resolve(__dirname, './dist'),
+    path: path.resolve(__dirname, '../targetj/jslib'),
     filename: 'targetj.js'
   }
 };