x4js 1.4.16 → 1.4.17

package/lib/application.d.ts

@@ -75,6 +75,8 @@ export declare class Application<P extends ApplicationProps = ApplicationProps,
     private m_app_uid;
     private m_local_storage;
     private m_user_data;
+    private m_touch_time;
+    private m_touch_count;
     constructor(props: P);
     ApplicationCreated(): void;
     get app_name(): string;
@@ -96,6 +98,6 @@ export declare class Application<P extends ApplicationProps = ApplicationProps,
     setTitle(title: string): void;
     disableZoomWheel(): void;
     enterModal(enter: boolean): void;
-    handleTouchEvents(): void;
+    enableTouchDblClick(): void;
 }
 export {};

package/lib/application.js

@@ -33,6 +33,7 @@ const base_component_1 = require("./base_component");
 const component_1 = require("./component");
 const settings_1 = require("./settings");
 const tools_1 = require("./tools");
+const _x4_touch_time = Symbol();
 /**
  * Represents an x4 application, which is typically a single page app.
  * You should inherit Application to define yours.
@@ -66,6 +67,8 @@ class Application extends base_component_1.BaseComponent {
     m_app_uid;
     m_local_storage;
     m_user_data;
+    m_touch_time;
+    m_touch_count;
     constructor(props) {
         console.assert(Application.self === null, 'application is a singleton');
         super(props);
@@ -75,6 +78,8 @@ class Application extends base_component_1.BaseComponent {
         let settings_name = `${this.m_app_name}.${this.m_app_version}.settings`;
         this.m_local_storage = new settings_1.Settings(settings_name);
         this.m_user_data = {};
+        this.m_touch_time = 0;
+        this.m_touch_count = 0;
         Application.self = this;
         if ('onload' in globalThis) {
             globalThis.addEventListener('load', () => {
@@ -146,29 +151,26 @@ class Application extends base_component_1.BaseComponent {
     }
     enterModal(enter) {
     }
-    handleTouchEvents() {
+    enableTouchDblClick() {
         document.addEventListener('touchstart', (ev) => {
-            let me = this;
-            let now = new Date().getTime();
-            if (!me.__last_touch || (me.__last_touch - now) > 700) {
-                me.__touch_cnt = 1;
+            let now = Date.now();
+            if ((now - this.m_touch_time) > 700) {
+                this.m_touch_count = 1;
             }
             else {
-                me.__touch_cnt++;
+                this.m_touch_count++;
             }
-            me.__last_touch = now;
-            if (me.__touch_cnt == 2) {
-                me.__touch_cnt = 0;
-                let fake = {
-                    type: "dblclick",
-                };
+            this.m_touch_time = now;
+            if (this.m_touch_count == 2) {
+                this.m_touch_count = 0;
+                // dirty fake dblclick event
                 const tch = ev.touches[0];
+                let fake = { type: "dblclick" };
                 for (const n in tch) {
                     fake[n] = tch[n];
                 }
-                // ts-ignore -> private
+                // ignore -> private: dirty x2
                 component_1.Component._dispatchEvent(fake);
-                ev.preventDefault();
                 ev.stopPropagation();
             }
         });

package/lib/router.js

@@ -53,7 +53,7 @@ function parseRoute(str, loose = false) {
             const o = tmp.indexOf('?', 1);
             const ext = tmp.indexOf('.', 1);
             keys.push(tmp.substring(1, o >= 0 ? o : ext >= 0 ? ext : tmp.length));
-            pattern += o < 0 && ext < 0 ? '(?:/([^/]+?))?' : '/([^/]+?)';
+            pattern += o >= 0 && ext < 0 ? '(?:/([^\/]+?))?' : '/([^\/]+?)';
             if (ext >= 0) {
                 pattern += (o >= 0 ? '?' : '') + '\\' + tmp.substring(ext);
             }

package/package.json

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

package/src/application.ts

@@ -34,6 +34,8 @@ import { Settings } from './settings'
 import { deferCall } from './tools'
 import { _tr } from './i18n'
 
+const _x4_touch_time = Symbol( );
+
 
 interface ApplicationEventMap extends BaseComponentEventMap {
 	message: EvMessage;
@@ -92,6 +94,9 @@ export class Application<P extends ApplicationProps = ApplicationProps, E extend
 	
 	private m_local_storage: Settings;
 	private m_user_data: any;
+
+	private m_touch_time: number;
+	private m_touch_count: number;
 	
 	constructor( props : P ) {
 		console.assert( Application.self===null, 'application is a singleton' );
@@ -104,6 +109,9 @@ export class Application<P extends ApplicationProps = ApplicationProps, E extend
 		let settings_name = `${this.m_app_name}.${this.m_app_version}.settings`;
 		this.m_local_storage = new Settings( settings_name );
 		this.m_user_data = {};
+
+		this.m_touch_time = 0;
+		this.m_touch_count = 0;
 	
 		(Application.self as any) = this;
 
@@ -195,37 +203,31 @@ export class Application<P extends ApplicationProps = ApplicationProps, E extend
 	public enterModal( enter: boolean ) {
 	}
 
-	public handleTouchEvents( ) {
+	public enableTouchDblClick( ) {
 		document.addEventListener( 'touchstart', ( ev: TouchEvent ) => {
 
-			let me = this as any;
-			let now = new Date( ).getTime();
-
-			if( !me.__last_touch || (me.__last_touch-now) > 700 ) {
-				me.__touch_cnt = 1;
+			let now = Date.now( );
+			if( (now-this.m_touch_time) > 700 ) {
+				this.m_touch_count = 1;
 			}
 			else {
-				me.__touch_cnt++;
+				this.m_touch_count++;
 			}
 
-			me.__last_touch = now;
+			this.m_touch_time = now;
 
-			if( me.__touch_cnt==2 ) {
-				me.__touch_cnt = 0;
-				
-				let fake = {
-					type: "dblclick", 
-				};
+			if( this.m_touch_count==2 ) {
+				this.m_touch_count = 0;
 
+				// dirty fake dblclick event
 				const tch = ev.touches[0];
+				let fake: any = {type: "dblclick" };
 				for( const n in tch ) {
 					fake[n] = tch[n];
 				}
 
-				// ts-ignore -> private
+				// ignore -> private: dirty x2
 				(Component as any)._dispatchEvent( fake );
-
-				ev.preventDefault( );
 				ev.stopPropagation( );
 			}
 		});

package/src/router.ts

@@ -72,7 +72,7 @@ function parseRoute(str: string | RegExp, loose = false): Segment {
 			const ext = tmp.indexOf('.', 1);
 
 			keys.push(tmp.substring(1, o >= 0 ? o : ext >= 0 ? ext : tmp.length));
-			pattern += o < 0 && ext < 0 ? '(?:/([^/]+?))?' : '/([^/]+?)';
+			pattern += o >= 0 && ext < 0 ? '(?:/([^\/]+?))?' : '/([^\/]+?)';
 			if (ext >= 0) {
 				pattern += (o >= 0 ? '?' : '') + '\\' + tmp.substring(ext);
 			}