dany/antos-frontend
1
0
Fork 0
mirror of https://github.com/lxsang/antos-frontend.git synced 2024-12-26 17:38:20 +01:00
Code Issues 1 Actions Projects Releases Wiki Activity

fix: dblclick event does not fire on mobile device (IOS)

Browse Source
This commit is contained in:
DanyLE 2024-01-08 14:26:32 +01:00 committed by Dany LE
parent d95f9382f3
commit 297d471c1d
4 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/core/core.ts
View File

@ -233,6 +233,36 @@ declare function __(...args: any[]): OS.FormattedString | string;
*/ */
declare function __e(e: Error): Error; declare function __e(e: Error): Error;
/**
* JQuery event-extensions to support doubletap on
* mobile device
*/
jQuery.event.special.dbltap = {
bindType: 'touchend',
delegateType: 'touchend',
handle: function (event: any) {
var handleObj = event.handleObj,
targetData = jQuery.data(event.target),
now = new Date().getTime(),
delta = targetData.lastTouch ? now - targetData.lastTouch : 0,
delay = delay == null ? 300 : delay;
if (delta < delay && delta > 30) {
targetData.lastTouch = null;
event.type = handleObj.origType;
['clientX', 'clientY', 'pageX', 'pageY'].forEach(function (property) {
event[property] = event.originalEvent.changedTouches[0][property];
})
// let jQuery handle the triggering of "dbltap" event handlers
handleObj.handler.apply(this, arguments);
} else {
targetData.lastTouch = now;
}
}
};
/** /**
* This namespace is the main entry point of AntOS * This namespace is the main entry point of AntOS
* API * API
@ -1196,16 +1226,14 @@ namespace OS {
* @export * @export
* @param {Promise} a Promise object * @param {Promise} a Promise object
*/ */
export function Task(fn: ( resolve: (any)=>void,reject:(any)=>void) => void ): Promise<any> export function Task(fn: (resolve: (any) => void, reject: (any) => void) => void): Promise<any> {
{ return new Promise(async (ok, nok) => {
return new Promise(async (ok,nok) =>{
const promise = new Promise(fn); const promise = new Promise(fn);
const ann:API.AnnouncementDataType<Promise<any>> = {} as API.AnnouncementDataType<Promise<any>>; const ann: API.AnnouncementDataType<Promise<any>> = {} as API.AnnouncementDataType<Promise<any>>;
ann.name = "OS"; ann.name = "OS";
ann.u_data = promise; ann.u_data = promise;
ann.id = Math.floor(Math.random() * 1e6); ann.id = Math.floor(Math.random() * 1e6);
try try {
{
ann.message = "ANTOS-TASK-PENDING"; ann.message = "ANTOS-TASK-PENDING";
announcer.trigger(ann.message, ann); announcer.trigger(ann.message, ann);
const data = await promise; const data = await promise;
@ -1213,8 +1241,7 @@ namespace OS {
ann.message = "ANTOS-TASK-FULFILLED"; ann.message = "ANTOS-TASK-FULFILLED";
announcer.trigger(ann.message, ann); announcer.trigger(ann.message, ann);
} }
catch(e) catch (e) {
{
ann.message = "ANTOS-TASK-REJECTED"; ann.message = "ANTOS-TASK-REJECTED";
announcer.trigger(ann.message, ann); announcer.trigger(ann.message, ann);
nok(__e(e)); nok(__e(e));
@ -1235,8 +1262,7 @@ namespace OS {
*/ */
export function post(p: string, d: any): Promise<any> { export function post(p: string, d: any): Promise<any> {
return API.Task(async (resolve, reject) => { return API.Task(async (resolve, reject) => {
try try {
{
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: p, url: p,
@ -1261,8 +1287,7 @@ namespace OS {
reject(e); reject(e);
}); });
} }
catch(e) catch (e) {
{
reject(__e(e)); reject(__e(e));
} }
}); });
@ -1306,14 +1331,14 @@ namespace OS {
* @returns {Promise<any>} * @returns {Promise<any>}
*/ */
export function upload(p: string, d: string): Promise<any> { export function upload(p: string, d: string): Promise<any> {
return new Promise( (resolve, reject) => { return new Promise((resolve, reject) => {
//insert a temporal file selector //insert a temporal file selector
const o = const o =
$("<input>") $("<input>")
.attr("type", "file") .attr("type", "file")
.attr("multiple", "true"); .attr("multiple", "true");
o.on("change", async () => { o.on("change", async () => {
try{ try {
const files = (o[0] as HTMLInputElement).files; const files = (o[0] as HTMLInputElement).files;
const formd = new FormData(); const formd = new FormData();
formd.append("path", d); formd.append("path", d);
@ -1338,8 +1363,7 @@ namespace OS {
}); });
resolve(ret); resolve(ret);
} }
catch(e) catch (e) {
{
reject(__e(e)); reject(__e(e));
} }
}); });
@ -1805,17 +1829,16 @@ namespace OS {
* @param {(obj: Object, key: string, value: any, path: any[]) => void} callback function * @param {(obj: Object, key: string, value: any, path: any[]) => void} callback function
* @returns {Proxy} the wrapper object * @returns {Proxy} the wrapper object
*/ */
export function watcher(target: GenericObject<any>, callback: (obj: Object, key: any, value: any, path:any[]) => void): Object export function watcher(target: GenericObject<any>, callback: (obj: Object, key: any, value: any, path: any[]) => void): Object {
{ const create_handle_for = (path: any[]) => {
const create_handle_for = (path:any[]) => {
return { return {
get: (obj: Object, key: any) => { get: (obj: Object, key: any) => {
if(typeof obj[key] === "object" && obj[key] !== null) { if (typeof obj[key] === "object" && obj[key] !== null) {
return new Proxy(obj[key], create_handle_for(path.concat(key))); return new Proxy(obj[key], create_handle_for(path.concat(key)));
} }
return obj[key]; return obj[key];
}, },
set: (obj: Object, prop:any, value: any) => { set: (obj: Object, prop: any, value: any) => {
obj[prop] = value; obj[prop] = value;
callback(obj, prop, value, path); callback(obj, prop, value, path);
return true; return true;

2
src/core/tags/GridViewTag.ts
View File

@ -305,7 +305,7 @@ namespace OS {
let evt = { id: this.aid, data: this }; let evt = { id: this.aid, data: this };
return this.cellselect(evt, false); return this.cellselect(evt, false);
}); });
$(this).on("dblclick", (e) => { $(this).on(OS.mobile?"dbltap":"dblclick", (e) => {
let evt = { id: this.aid, data: this }; let evt = { id: this.aid, data: this };
return this.cellselect(evt, true); return this.cellselect(evt, true);
}); });

2
src/core/tags/ListViewTag.ts
View File

@ -182,7 +182,7 @@ namespace OS {
e.stopPropagation(); e.stopPropagation();
}); });
$(this.refs.item).on("dblclick",(e) => { $(this.refs.item).on(OS.mobile?"dbltap":"dblclick",(e) => {
this._ondbclick({ id: this.aid, data: this, originalEvent: e }); this._ondbclick({ id: this.aid, data: this, originalEvent: e });
e.stopPropagation(); e.stopPropagation();
}); });

2
src/core/tags/TreeViewTag.ts
View File

@ -384,7 +384,7 @@ namespace OS {
$(this.refs.wrapper).on("click",(e) => { $(this.refs.wrapper).on("click",(e) => {
this.selected = true; this.selected = true;
}); });
$(this.refs.wrapper).on("dblclick", (e) => { $(this.refs.wrapper).on(OS.mobile?"dbltap":"dblclick", (e) => {
this._evt.data.dblclick = true; this._evt.data.dblclick = true;
this.selected = true; this.selected = true;
}); });