targetj 1.0.23 → 1.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "keywords": [
     "targetj"
   ],

package/src/App.js

@@ -12,7 +12,7 @@ import { TargetManager } from "./TargetManager.js";
 
 var tapp;
 
-function App(uiFn, rootId) {
+function App(tmodel, rootId) {
     
     function my() {} 
     
@@ -20,12 +20,10 @@ function App(uiFn, rootId) {
     my.debugLevel = 0;
 
     my.runningFlag = false;
-
-    my.oids = {};    
     
-    my.rootId = rootId ? rootId || uiFn.rootId : "#tpage";
+    my.rootId = rootId ? rootId : "#tpage";
 
-    my.init = function(uiFn) {
+    my.init = function() {
         browser.setup();
         
         my.window = new $Dom(window);
@@ -35,17 +33,27 @@ function App(uiFn, rootId) {
             }
         });
         
-        my.uiFn = uiFn;
-        this.ui = uiFn();
-        this.ui.xVisible = true;
-        this.ui.yVisible = true;
-        
         my.loader = new LoadingManager();
         
         my.pagers = new PageManager();
                  
         my.dim = Dim().measureScreen();
         
+        my.ui = new TModel("ui", {
+            width: {
+                loop: true, width: function() { return my.dim.screen.width; }
+            },
+            height: {
+                loop: true, height: function() { return my.dim.screen.height; }
+            }            
+        });
+        my.ui.xVisible = true;
+        my.ui.yVisible = true; 
+        
+        if (tmodel) {
+            my.ui.addChild(tmodel);
+        }
+      
         my.events = new EventListener();
         
         my.locationManager = new LocationManager();
@@ -56,7 +64,7 @@ function App(uiFn, rootId) {
 
         return my;
     };
-    
+
     my.start = function () {
         my.runningFlag = false; 
         
@@ -98,6 +106,10 @@ function App(uiFn, rootId) {
         return my;
     };
     
+    my.addUI = function(tmodel) {
+        my.ui.addChild(tmodel);
+    };
+    
     my.resetRuns = function() {
         my.manager.nextRuns = [];
         my.manager.runningStep = 0;
@@ -126,31 +138,20 @@ function App(uiFn, rootId) {
         return SearchUtil.find(oid);
     };
    
-    my.getOid = function(type) { 
-        if (!TUtil.isDefined(my.oids[type]))  {
-            my.oids[type] = 0;
-        }
-        
-        var num = my.oids[type]++;
-        return { oid: num > 0 ? type + num : type, num: num };
-    };
-    
-    my.brackets = function(oid) {
-        return tapp.locationManager.bracketMap[oid] ? tapp.locationManager.bracketMap[oid].list : null;
-    };
-    
     tapp = my;
-    my.init(uiFn).start();
+    my.init().start();
 
     return my;
 }
-//
-//$Dom.ready(function() {
-//    window._ = window._ || SearchUtil.find;
-//
-//    if (typeof window.MainT === 'function') {
-//        App(MainT);
-//    }
-//});
+
+App.oids = {};
+App.getOid = function(type) { 
+    if (!TUtil.isDefined(App.oids[type]))  {
+        App.oids[type] = 0;
+    }
+
+    var num = App.oids[type]++;
+    return { oid: num > 0 ? type + num : type, num: num };
+};
 
 export { tapp, App };

package/src/PageManager.js

@@ -28,7 +28,7 @@ PageManager.prototype.openPage = function(link, isPageFetchNeeded) {
             data: { tpageOnly: true }, 
             success: function (data) {
                 tapp.$dom.outerHTML(data);                                
-                tapp.ui = tapp.uiFn();               
+                tapp.resetUI();              
                 self.lastLink = link;
                 tapp.start();
             },
@@ -40,7 +40,7 @@ PageManager.prototype.openPage = function(link, isPageFetchNeeded) {
 
     } else if (!this.pageCache[link]) {
         tapp.$dom.innerHTML("");                                
-        tapp.ui = tapp.uiFn();
+        tapp.resetUI();
         self.lastLink = link;        
         setTimeout(tapp.start);  
     } else {

package/src/TModel.js

@@ -1,4 +1,4 @@
-import { tapp } from "./App.js";
+import { tapp, App } from "./App.js";
 import { browser } from "./Browser.js";
 import { SearchUtil } from "./SearchUtil.js";
 import { TUtil } from "./TUtil.js";
@@ -14,7 +14,7 @@ function TModel(type, targets) {
     
     this.type = type ? type : TUtil.getTypeFromCallerFile() || 'blank';
     this.targets = Object.assign({}, targets);  
-    var uniqueId = tapp.getOid(this.type);
+    var uniqueId = App.getOid(this.type);
     this.oid = uniqueId.oid;
     this.oidNum = uniqueId.num;