From bf0e2a0be1b78690cba8aa9fab5fdde2359d90f4 Mon Sep 17 00:00:00 2001 From: "Godwin peter .O" Date: Tue, 16 Oct 2018 02:45:56 +0100 Subject: Create TouchFix62.js --- web/app/view/TouchFix62.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 web/app/view/TouchFix62.js (limited to 'web') diff --git a/web/app/view/TouchFix62.js b/web/app/view/TouchFix62.js new file mode 100644 index 00000000..59c9baf2 --- /dev/null +++ b/web/app/view/TouchFix62.js @@ -0,0 +1,49 @@ +/* + * Copyright 2018 Anton Tananaev (anton@traccar.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * workaround for bug in ExtJs 6.2.0. + * Resolved in current yet unreleased version + */ + +Ext.define('Traccar.view.TouchFix62', { + override: 'Ext.dom.Element' +}, +function(){ + var additiveEvents = this.prototype.additiveEvents, + eventMap = this.prototype.eventMap; + if(Ext.supports.TouchEvents && Ext.firefoxVersion >= 52 && Ext.os.is.Desktop){ + eventMap['touchstart'] = 'mousedown'; + eventMap['touchmove'] = 'mousemove'; + eventMap['touchend'] = 'mouseup'; + eventMap['touchcancel'] = 'mouseup'; + eventMap['click'] = 'click'; + eventMap['dblclick'] = 'dblclick'; + additiveEvents['mousedown'] = 'mousedown'; + additiveEvents['mousemove'] = 'mousemove'; + additiveEvents['mouseup'] = 'mouseup'; + additiveEvents['touchstart'] = 'touchstart'; + additiveEvents['touchmove'] = 'touchmove'; + additiveEvents['touchend'] = 'touchend'; + additiveEvents['touchcancel'] = 'touchcancel'; + + additiveEvents['pointerdown'] = 'mousedown'; + additiveEvents['pointermove'] = 'mousemove'; + additiveEvents['pointerup'] = 'mouseup'; + additiveEvents['pointercancel'] = 'mouseup'; + } +}) -- cgit v1.2.3 From 487de5e2b87fa1dde2b8c8685e9a6617d1eff694 Mon Sep 17 00:00:00 2001 From: "Godwin peter .O" Date: Tue, 16 Oct 2018 02:46:36 +0100 Subject: Update Application.js --- web/app/Application.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'web') diff --git a/web/app/Application.js b/web/app/Application.js index a4cbbf22..9b718807 100644 --- a/web/app/Application.js +++ b/web/app/Application.js @@ -21,7 +21,8 @@ Ext.define('Traccar.Application', { requires: [ 'Traccar.Style', - 'Traccar.AttributeFormatter' + 'Traccar.AttributeFormatter', + 'Traccar.view.TouchFix62' ], models: [ -- cgit v1.2.3 From f4b596869e8f5e9af19f18fb33cb146742a8c252 Mon Sep 17 00:00:00 2001 From: "Godwin peter .O" Date: Tue, 16 Oct 2018 02:58:09 +0100 Subject: Update TouchFix62.js --- web/app/view/TouchFix62.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'web') diff --git a/web/app/view/TouchFix62.js b/web/app/view/TouchFix62.js index 59c9baf2..300d4f70 100644 --- a/web/app/view/TouchFix62.js +++ b/web/app/view/TouchFix62.js @@ -15,18 +15,18 @@ * along with this program. If not, see . */ -/** - * workaround for bug in ExtJs 6.2.0. +/* + * Workaround for bug in ExtJs 6.2.0. * Resolved in current yet unreleased version */ Ext.define('Traccar.view.TouchFix62', { override: 'Ext.dom.Element' }, -function(){ +function () { var additiveEvents = this.prototype.additiveEvents, eventMap = this.prototype.eventMap; - if(Ext.supports.TouchEvents && Ext.firefoxVersion >= 52 && Ext.os.is.Desktop){ + if (Ext.supports.TouchEvents && Ext.firefoxVersion >= 52 && Ext.os.is.Desktop) { eventMap['touchstart'] = 'mousedown'; eventMap['touchmove'] = 'mousemove'; eventMap['touchend'] = 'mouseup'; @@ -40,10 +40,9 @@ function(){ additiveEvents['touchmove'] = 'touchmove'; additiveEvents['touchend'] = 'touchend'; additiveEvents['touchcancel'] = 'touchcancel'; - additiveEvents['pointerdown'] = 'mousedown'; additiveEvents['pointermove'] = 'mousemove'; additiveEvents['pointerup'] = 'mouseup'; additiveEvents['pointercancel'] = 'mouseup'; } -}) +}); -- cgit v1.2.3