x4js 1.5.24 → 1.5.25

package/lib/src/application.ts

@@ -33,6 +33,7 @@ import { BaseComponent, BaseComponentEventMap, BaseComponentProps } from './base
 import { Component, flyWrap } from './component'
 import { Settings } from './settings'
 import { _tr } from './i18n'
+import { Router } from 'x4js'
 
 const _x4_touch_time = Symbol( );
 
@@ -97,6 +98,8 @@ export class Application<P extends ApplicationProps = ApplicationProps, E extend
 
 	private m_touch_time: number;
 	private m_touch_count: number;
+
+	private m_router: Router;
 	
 	constructor( props : P ) {
 		console.assert( Application.self===null, 'application is a singleton' );
@@ -112,8 +115,9 @@ export class Application<P extends ApplicationProps = ApplicationProps, E extend
 
 		this.m_touch_time = 0;
 		this.m_touch_count = 0;
+		this.m_router = null;
 	
-		(Application.self as any) = this;
+		x4app = (Application.self as any) = this;
 
 		if( 'onload' in globalThis ) {
 			globalThis.addEventListener( 'load', ( ) => {
@@ -129,6 +133,13 @@ export class Application<P extends ApplicationProps = ApplicationProps, E extend
 		this.setTitle( '' );
 	}
 
+	public get router( ) {
+		if( !this.m_router ) {
+			this.m_router = new Router( );
+		}
+		return this.m_router;
+	}
+
 	public get app_name( ) {
 		return this.m_app_name;
 	}
@@ -247,5 +258,5 @@ export class Application<P extends ApplicationProps = ApplicationProps, E extend
 	}
 };
 
-
+export let x4app: Application;
 

package/lib/src/router.ts

@@ -156,6 +156,10 @@ export class Router extends EventSource< RouterEventMap > {
 
 	navigate( uri: string, notify = true ) {
 
+		if( !uri.startsWith('/') ) {
+			uri = '/'+uri;
+		}
+
 		const found = this._find( uri );
 
 		if( !found || found.handlers.length==0 ) {

package/lib/src/version.ts

@@ -27,4 +27,4 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
 
-export const x4js_version = "1.5.24";
+export const x4js_version = "1.5.25";

package/lib/types/application.d.ts

@@ -30,6 +30,7 @@ import { EvMessage } from './x4events';
 import { BaseComponent, BaseComponentEventMap, BaseComponentProps } from './base_component';
 import { Component } from './component';
 import { Settings } from './settings';
+import { Router } from 'x4js';
 interface ApplicationEventMap extends BaseComponentEventMap {
     message: EvMessage;
     global: EvMessage;
@@ -77,8 +78,10 @@ export declare class Application<P extends ApplicationProps = ApplicationProps,
     private m_user_data;
     private m_touch_time;
     private m_touch_count;
+    private m_router;
     constructor(props: P);
     ApplicationCreated(): void;
+    get router(): Router;
     get app_name(): string;
     get app_uid(): string;
     get app_version(): string;
@@ -101,4 +104,5 @@ export declare class Application<P extends ApplicationProps = ApplicationProps,
     enterModal(enter: boolean): void;
     enableTouchDblClick(): void;
 }
+export declare let x4app: Application;
 export {};

package/lib/types/version.d.ts

@@ -26,4 +26,4 @@
 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 **/
-export declare const x4js_version = "1.5.24";
+export declare const x4js_version = "1.5.25";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "x4js",
-	"version": "1.5.24",
+	"version": "1.5.25",
 	"description": "X4js core files",
 	"main": "lib/cjs/index.js",
 	"types": "lib/types/index.d.ts",