targetj 1.0.30 → 1.0.31

package/Exports.js

@@ -1,5 +1,2 @@
-import { tapp, App } from "./src/App.js";
-import { TModel } from "./src/TModel.js";
-
-var events = tapp.events;
-export { tapp, App, TModel, events };
+export * from "./src/App.js"
+export * from "./src/TModel.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "keywords": [
     "targetj"
   ],

package/src/App.js

@@ -13,7 +13,7 @@ import { TargetManager } from "./TargetManager.js";
 
 var tapp;
 
-function App(tmodel, rootId) {
+function Application(tmodel, rootId) {
     
     function my() {} 
     
@@ -138,13 +138,21 @@ function App(tmodel, rootId) {
     my.find = function(oid) {
         return SearchUtil.find(oid);
     };
-   
-    tapp = my;
-    my.init().start();
 
     return my;
 }
-   
+
+function App(tmodel, rootId) {
+    tapp = Application(tmodel, rootId);
+    tapp.init().start();
+    return tapp;
+}
+
+function events() {
+    return tapp ? tapp.events : null;
+}
+
+ 
 window.t = window.t || SearchUtil.find;
 App.oids = {};
 App.getOid = function(type) { 
@@ -156,4 +164,4 @@ App.getOid = function(type) {
     return { oid: num > 0 ? type + num : type, num: num };
 };
 
-export { tapp, App };
+export { tapp, App, events };