haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix several regressions from touch unification 

Touch unification (b3bff28bed, change ID
I9016fc15ad3ccb3664af348fdcdca006495b0778) was a rework of the input
system to better support touch devices, but unfortunately it caused some
fairly serious regressions. This commit fixes the following:
- Triple/Quadruple clicking was no longer recognized on non-touch
  devices.
- There were some issues recognizing wrapped events
- Pens were considered to be touch devices, but this broke some
  remote/virtual machine setups. It's possible that this change will
  cause a regression for apple pencil users. I plan to get an Apple
  pencil to test whether preventing pens from being touch devices breaks
  the Apple pencil workflow instead
- manualDrag was taken to mean "is on a touch device". This is only
  almost true, causing some input to be incorrectly ingnored when it was
  not
- manualDrag and _manualDrag were confused. They affect different
  things, and we now recognize this

Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
Change-Id: Iab0d3bcca588eaed14469597868a9c4e2dcf8488
Signed-off-by: Skyler Grey <skyler.grey@collabora.com>
private/mmeeks/tilesize
Skyler Grey 2023-12-08 13:21:55 +00:00 committed by Szymon Kłos
parent 1ce9f834a0
commit 61aa037ad9
18 changed files with 182 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
browser/js/global.js
View File

@ -268,35 +268,95 @@ window.app = {
},
};
global.memo = {
_lastId: 0,
/// This does pretty much the same as L.stamp. We can't use L.stamp because it's not yet in-scope by the first time we want to call global.memo.decorator
/// If you are able to use L.stamp instead, you probably should
_getId: function(obj) {
if (obj === null || obj === undefined) {
return '' + obj;
}
if (!('_coolMemoId' in obj)) {
obj['_coolMemoId'] = ++global.memo._lastId;
}
return obj._coolMemoId;
},
_decoratorMemo: {},
/// A decorator factory, which takes a decorator and prevents it from creating new instances when wrapping the same function
/// This is particularly useful for functions that take events, say, as .on and .off won't work properly if you don't provide the same function instance
decorator: function(decorator, context) {
var decoratorId = global.memo._getId(decorator);
var contextId = global.memo._getId(context);
return function(f) {
var functionId = global.memo._getId(f);
if (global.memo._decoratorMemo[decoratorId + ' ' + contextId + ' ' + functionId] === undefined) {
global.memo._decoratorMemo[decoratorId + ' ' + contextId + ' ' + functionId] = decorator.apply(this, arguments);
if (context !== null && context !== undefined) {
global.memo._decoratorMemo[decoratorId + ' ' + contextId + ' ' + functionId] = global.memo._decoratorMemo[decoratorId + ' ' + contextId + ' ' + functionId].bind(context);
}
}
return global.memo._decoratorMemo[decoratorId + ' ' + contextId + ' ' + functionId];
};
},
_bindMemo: {},
/// A decorator, which takes a function and binds it to an object
/// Similar to L.bind, but when given the same function and context we will return the previously bound function
bind: function(f, context) {
var functionId = global.memo._getId(f);
var contextId = global.memo._getId(context);
if (global.memo._bindMemo[functionId + ' ' + contextId] === undefined) {
global.memo._bindMemo[functionId + ' ' + contextId] = f.bind(context);
}
return global.memo._bindMemo[functionId + ' ' + contextId];
}
};
global.touch = {
/// a touchscreen event handler, supports both DOM and hammer.js events
isTouchEvent: function(e) {
if (e.originalEvent) {
e = e.originalEvent;
}
if (L.Browser.cypressTest && global.L.Browser.mobile) {
return true; // As cypress tests on mobile tend to use "click" events instead of touches... we cheat to get them recognized as touch events
}
if (!e.pointerType) {
return !(e instanceof MouseEvent);
if (e.pointerType) {
return e.pointerType === 'touch' || e.pointerType === 'kinect';
}
return e.pointerType === 'touch' || e.pointerType == 'pen' || e.pointerType == 'kinect';
if (e.isMouseEvent !== undefined) {
return !e.isMouseEvent;
}
return !(e instanceof MouseEvent);
},
/// a decorator that only runs the function if the event is a touch event
touchOnly: function(f) {
touchOnly: global.memo.decorator(function(f) {
return function(e) {
if (!global.touch.isTouchEvent(e)) return;
return f.apply(this, arguments);
};
},
}),
/// a decorator that only runs the function if the event is not a touch event
mouseOnly: function(f) {
mouseOnly: global.memo.decorator(function(f) {
return function(e) {
if (global.touch.isTouchEvent(e)) return;
return f.apply(this, arguments);
};
},
}),
/// detect if the primary pointing device is of limited accuracy (generally a touchscreen)
/// you shouldn't use this for determining the behavior of an event (use isTouchEvent instead), but this may

3
browser/src/control/Permission.js
View File

@ -193,7 +193,8 @@ L.Map.include({
_enterEditMode: function (perm) {
this._permission = perm;
this.dragging.disable();
this.dragging.disable(); // FIXME: before unification, this was only called when not on a touch device.
// It would be better to split dragging.disable into a touch version and a mouse version but this looks like it will require a major rework of its own...
if ((window.mode.isMobile() || window.mode.isTablet()) && this._textInput && this.getDocType() === 'text') {
this._textInput.setSwitchedToEditMode();

6
browser/src/control/Ruler.js
View File

@ -137,9 +137,9 @@ L.Control.Ruler = L.Control.extend({
self._moveIndentationEnd(event);
}));
L.DomEvent.on(this._firstLineMarker, 'mousedown', this._initiateIndentationDrag, this);
L.DomEvent.on(this._pStartMarker, 'mousedown', this._initiateIndentationDrag, this);
L.DomEvent.on(this._pEndMarker, 'mousedown', this._initiateIndentationDrag, this);
L.DomEvent.on(this._firstLineMarker, 'mousedown', window.touch.mouseOnly(this._initiateIndentationDrag), this);
L.DomEvent.on(this._pStartMarker, 'mousedown', window.touch.mouseOnly(this._initiateIndentationDrag), this);
L.DomEvent.on(this._pEndMarker, 'mousedown', window.touch.mouseOnly(this._initiateIndentationDrag), this);
},
_initLayout: function() {

4
browser/src/dom/DomEvent.MultiClick.js
View File

@ -41,7 +41,9 @@ L.extend(L.DomEvent, {
clientX: e.clientX,
clientY: e.clientY,
button: e.button,
target: e.target
target: e.target,
pointerType: e.pointerType,
isMouseEvent: e instanceof MouseEvent
};
handler(eOut);

28
browser/src/dom/Draggable.js
View File

@ -21,6 +21,18 @@ L.Draggable = L.Evented.extend({
}
},
_manualDrag: function() {
return false;
},
noManualDrag: window.memo.decorator(function(f) {
return function(e) {
if (!this._manualDrag(e)) {
return f.apply(this, arguments);
}
};
}),
initialize: function (element, dragStartTarget, preventOutline) {
this._element = element;
this._dragStartTarget = dragStartTarget || element;
@ -38,17 +50,17 @@ L.Draggable = L.Evented.extend({
},
enable: function () {
if (this._manualDrag || this._enabled) { return; }
if (this._enabled) { return; }
L.DomEvent.on(this._dragStartTarget, L.Draggable.START.join(' '), this._onDown, this);
L.DomEvent.on(this._dragStartTarget, L.Draggable.START.join(' '), this.noManualDrag(this._onDown), this);
this._enabled = true;
},
disable: function () {
if (this._manualDrag || !this._enabled) { return; }
if (!this._enabled) { return; }
L.DomEvent.off(this._dragStartTarget, L.Draggable.START.join(' '), this._onDown, this);
L.DomEvent.off(this._dragStartTarget, L.Draggable.START.join(' '), this.noManualDrag(this._onDown), this);
this._enabled = false;
this._moved = false;
@ -90,8 +102,8 @@ L.Draggable = L.Evented.extend({
this.startOffset = this._startPoint.subtract(new L.Point(startBoundingRect.left, startBoundingRect.top));
L.DomEvent
.on(document, L.Draggable.MOVE[e.type], window.touch.mouseOnly(this._onMove), this)
.on(document, L.Draggable.END[e.type], window.touch.mouseOnly(this._onUp), this);
.on(document, L.Draggable.MOVE[e.type], this.noManualDrag(this._onMove), this)
.on(document, L.Draggable.END[e.type], this.noManualDrag(this._onUp), this);
},
_onMove: function (e) {
@ -178,8 +190,8 @@ L.Draggable = L.Evented.extend({
for (var i in L.Draggable.MOVE) {
L.DomEvent
.off(document, L.Draggable.MOVE[i], this._onMove, this)
.off(document, L.Draggable.END[i], this._onUp, this);
.off(document, L.Draggable.MOVE[i], this.noManualDrag(this._onMove), this)
.off(document, L.Draggable.END[i], this.noManualDrag(this._onUp), this);
}
L.DomUtil.enableImageDrag();

22
browser/src/layer/vector/Path.Drag.js
View File

@ -62,6 +62,14 @@ L.Handler.PathDrag = L.Handler.extend(/** @lends L.Path.Drag.prototype */ {
},
noManualDrag: function(f) {
if ('noManualDrag' in this._path) {
return this._path.noManualDrag(f);
} else {
return f;
}
},
/**
* Enable dragging
*/
@ -86,8 +94,8 @@ L.Handler.PathDrag = L.Handler.extend(/** @lends L.Path.Drag.prototype */ {
this._path.removeClass(L.Handler.PathDrag.DRAGGING_CLS);
L.DomEvent.off(document, 'mousemove touchmove', this._onDrag, this);
L.DomEvent.off(document, 'mouseup touchend', this._onDragEnd, this);
L.DomEvent.off(document, 'mousemove touchmove', this.noManualDrag(this._onDrag), this);
L.DomEvent.off(document, 'mouseup touchend', this.noManualDrag(this._onDragEnd), this);
},
/**
@ -117,8 +125,8 @@ L.Handler.PathDrag = L.Handler.extend(/** @lends L.Path.Drag.prototype */ {
this._path._renderer.addContainerClass('leaflet-interactive');
L.DomEvent
.on(document, MOVE[eventType], this._onDrag, this)
.on(document, END[eventType], this._onDragEnd, this);
.on(document, MOVE[eventType], this.noManualDrag(this._onDrag), this)
.on(document, END[eventType], this.noManualDrag(this._onDragEnd), this);
if (this._path._map.dragging.enabled()) {
// I guess it's required because mousedown gets simulated with a delay
@ -230,8 +238,8 @@ L.Handler.PathDrag = L.Handler.extend(/** @lends L.Path.Drag.prototype */ {
this._path._transform(null);
}
L.DomEvent.off(document, 'mousemove touchmove', this._onDrag, this);
L.DomEvent.off(document, 'mouseup touchend', this._onDragEnd, this);
L.DomEvent.off(document, 'mousemove touchmove', this.noManualDrag(this._onDrag), this);
L.DomEvent.off(document, 'mouseup touchend', this.noManualDrag(this._onDragEnd), this);
this._restoreCoordGetters();
@ -260,7 +268,7 @@ L.Handler.PathDrag = L.Handler.extend(/** @lends L.Path.Drag.prototype */ {
this._path._map.dragging.enable();
}
if (!moved && this._mouseDown && !window.touch.isTouchEvent(this._mouseDown)) {
if (!moved && this._mouseDown && !this._path.options.manualDrag(this._mouseDown)) {
this._path._map._handleDOMEvent(this._mouseDown);
this._path._map._handleDOMEvent(evt);
}

25
browser/src/layer/vector/SVGGroup.js
View File

@ -9,8 +9,17 @@ L.SVGGroup = L.Layer.extend({
options: {
noClip: true,
manualDrag: window.touch.isTouchEvent,
},
noManualDrag: window.memo.decorator(function(f) {
return function(e) {
if (!this.options.manualDrag(e)) {
return f.apply(this, arguments);
}
};
}),
initialize: function (bounds, options) {
L.setOptions(this, options);
this._pathNodeCollection = new L.Path.PathNodeCollection();
@ -171,10 +180,10 @@ L.SVGGroup = L.Layer.extend({
this._moved = false;
this._forEachDragShape(function (dragShape) {
L.DomEvent.on(dragShape, 'mousemove', this._onDrag, this);
L.DomEvent.on(dragShape, 'mouseup', this._onDragEnd, this);
L.DomEvent.on(dragShape, 'mousemove', this.noManualDrag(this._onDrag), this);
L.DomEvent.on(dragShape, 'mouseup', this.noManualDrag(this._onDragEnd), this);
if (this.dragging.constraint)
L.DomEvent.on(dragShape, 'mouseout', this._onDragEnd, this);
L.DomEvent.on(dragShape, 'mouseout', this.noManualDrag(this._onDragEnd), this);
}.bind(this));
var data = {
@ -207,10 +216,10 @@ L.SVGGroup = L.Layer.extend({
return;
this._forEachDragShape(function (dragShape) {
L.DomEvent.off(dragShape, 'mousemove', this._onDrag, this);
L.DomEvent.off(dragShape, 'mouseup', this._onDragEnd, this);
L.DomEvent.off(dragShape, 'mousemove', this.noManualDrag(this._onDrag), this);
L.DomEvent.off(dragShape, 'mouseup', this.noManualDrag(this._onDragEnd), this);
if (this.dragging.constraint)
L.DomEvent.off(dragShape, 'mouseout', this._onDragEnd, this);
L.DomEvent.off(dragShape, 'mouseout', this.noManualDrag(this._onDragEnd), this);
}.bind(this));
this._moved = false;
@ -224,7 +233,7 @@ L.SVGGroup = L.Layer.extend({
this.fire('graphicmoveend', {pos: pos});
}
if (window.touch.isTouchEvent(evt) || evt.type === 'mouseup')
if (this.options.manualDrag(evt) || evt.type === 'mouseup')
this.dragging._onDragEnd(evt);
this._dragStarted = false;
},
@ -284,7 +293,7 @@ L.SVGGroup = L.Layer.extend({
nodeData.setCustomField('dragShape', rectNode);
this._dragShapePresent = true;
L.DomEvent.on(rectNode, 'mousedown', this._onDragStart, this);
L.DomEvent.on(rectNode, 'mousedown', this.noManualDrag(this._onDragStart), this);
}.bind(this));
this.sizeSVG();

10
browser/src/map/Map.js
View File

@ -137,12 +137,13 @@ L.Map = L.Evented.extend({
this.addHandler('keyboard', L.Map.Keyboard);
this.addHandler('dragging', L.Map.Drag);
this.addHandler('touchGesture', L.Map.TouchGesture);
this.dragging.disable(); // FIXME: before unification, this was only called when on a touch device or in a mobile cypress test
// It would be better to split dragging.disable into a touch version and a mouse version but this looks like it will require a major rework of its own...
this.addHandler('mouse', L.Map.Mouse);
this.addHandler('scrollHandler', L.Map.Scroll);
this.addHandler('doubleClickZoom', L.Map.DoubleClickZoom);
this.addHandler('touchGesture', L.Map.TouchGesture);
this.dragging._draggable._manualDrag = window.touch.isTouchEvent;
if (this.options.imagePath) {
L.Icon.Default.imagePath = this.options.imagePath;
@ -1221,7 +1222,8 @@ L.Map = L.Evented.extend({
this._fadeAnimated = this.options.fadeAnimation && L.Browser.any3d;
L.DomUtil.addClass(container, 'leaflet-container leaflet-touch' +
L.DomUtil.addClass(container, 'leaflet-container' +
(window.touch.hasAnyTouchscreen() ? ' leaflet-touch' : '') +
(L.Browser.retina ? ' leaflet-retina' : '') +
(L.Browser.ielt9 ? ' leaflet-oldie' : '') +
(L.Browser.safari ? ' leaflet-safari' : '') +

8
browser/src/map/handler/Map.DoubleClickZoom.js
View File

@ -9,14 +9,14 @@ L.Map.mergeOptions({
L.Map.DoubleClickZoom = L.Handler.extend({
addHooks: function () {
this._map.on('dblclick', window.touch.mouseOnly(this._onDoubleClick), this);
this._map.on('dblclick', this._onDoubleClick, this);
},
removeHooks: function () {
this._map.off('dblclick', window.touch.mouseOnly(this._onDoubleClick), this);
this._map.off('dblclick', this._onDoubleClick, this);
},
_onDoubleClick: function (e) {
_onDoubleClick: window.touch.mouseOnly(function (e) {
var map = this._map,
oldZoom = map.getZoom(),
zoom = e.originalEvent.shiftKey ? Math.ceil(oldZoom) - 1 : Math.floor(oldZoom) + 1;
@ -26,5 +26,5 @@ L.Map.DoubleClickZoom = L.Handler.extend({
} else {
map.setZoomAround(e.containerPoint, zoom);
}
}
})
});

12
browser/src/map/handler/Map.Mouse.js
View File

@ -39,7 +39,7 @@ L.Map.Mouse = L.Handler.extend({
right: 2
},
_onMouseEvent: function (e) {
_onMouseEvent: window.touch.mouseOnly(function (e) {
if (this._map.uiManager.isUIBlocked())
return;
@ -233,7 +233,7 @@ L.Map.Mouse = L.Handler.extend({
L.DomEvent.on(document, 'mousemove', this._onMouseMoveOutside, this);
L.DomEvent.on(document, 'mouseup', this._onMouseUpOutside, this);
}
},
}),
_executeMouseEvents: function () {
this._holdMouseEvent = null;
@ -243,14 +243,14 @@ L.Map.Mouse = L.Handler.extend({
this._mouseEventsQueue = [];
},
_onMouseMoveOutside: function (e) {
_onMouseMoveOutside: window.touch.mouseOnly(function (e) {
this._map._handleDOMEvent(e);
if (this._map.dragging.enabled()) {
this._map.dragging._draggable._onMove(e);
}
},
}),
_onMouseUpOutside: function (e) {
_onMouseUpOutside: window.touch.mouseOnly(function (e) {
this._mouseDown = false;
L.DomEvent.off(document, 'mousemove', this._onMouseMoveOutside, this);
L.DomEvent.off(document, 'mouseup', this._onMouseUpOutside, this);
@ -263,5 +263,5 @@ L.Map.Mouse = L.Handler.extend({
if (this._map.dragging.enabled()) {
this._map.dragging._draggable._onUp(e);
}
}
})
});

11
browser/src/map/handler/Map.Scroll.js
View File

@ -14,11 +14,12 @@ L.Map.mergeOptions({
});
L.Map.Scroll = L.Handler.extend({
_mouseOnlyPreventDefault: window.touch.mouseOnly(L.DomEvent.preventDefault),
addHooks: function () {
L.DomEvent.on(this._map._container, {
wheel: this._onWheelScroll,
mousewheel: this._onWheelScroll,
MozMousePixelScroll: L.DomEvent.preventDefault
MozMousePixelScroll: this._mouseOnlyPreventDefault
}, this);
this._delta = 0;
@ -37,7 +38,7 @@ L.Map.Scroll = L.Handler.extend({
removeHooks: function () {
L.DomEvent.off(this._map._container, {
mousewheel: this._onWheelScroll,
MozMousePixelScroll: L.DomEvent.preventDefault
MozMousePixelScroll: this._mouseOnlyPreventDefault
}, this);
if (!this._map.touchGesture) {
L.DomEvent.off(this._map._container, {
@ -47,12 +48,12 @@ L.Map.Scroll = L.Handler.extend({
}
},
_onTouchScrollStart: this.touch.mouseOnly(function (e) {
_onTouchScrollStart: window.touch.mouseOnly(function (e) {
this.lastX = e.touches[0].clientX;
this.lastY = e.touches[0].clientY;
}),
_onTouchScroll: this.touch.mouseOnly(function (e) {
_onTouchScroll: window.touch.mouseOnly(function (e) {
var top = e.touches[0].clientY;
var start = e.touches[0].clientX;
var deltaX = (start - this.lastX);
@ -75,7 +76,7 @@ L.Map.Scroll = L.Handler.extend({
this._timer = setTimeout(L.bind(this._performScroll, this), left);
}),
_onWheelScroll: this.touch.mouseOnly(function (e) {
_onWheelScroll: window.touch.mouseOnly(function (e) {
var delta = -1 * e.deltaY; // L.DomEvent.getWheelDelta(e);
var debounce = this._map.options.wheelDebounceTime;

52
browser/src/map/handler/Map.TouchGesture.js
View File

@ -99,43 +99,43 @@ L.Map.TouchGesture = L.Handler.extend({
},
addHooks: function () {
this._hammer.on('hammer.input', L.bind(window.touch.touchOnly(this._onHammer), this));
this._hammer.on('tap', L.bind(window.touch.touchOnly(this._onTap), this));
this._hammer.on('panstart', L.bind(window.touch.touchOnly(this._onPanStart), this));
this._hammer.on('pan', L.bind(window.touch.touchOnly(this._onPan), this));
this._hammer.on('panend', L.bind(window.touch.touchOnly(this._onPanEnd), this));
this._hammer.on('pinchstart', L.bind(window.touch.touchOnly(this._onPinchStart), this));
this._hammer.on('pinchmove', L.bind(window.touch.touchOnly(this._onPinch), this));
this._hammer.on('pinchend', L.bind(window.touch.touchOnly(this._onPinchEnd), this));
this._hammer.on('tripletap', L.bind(window.touch.touchOnly(this._onTripleTap), this));
this._hammer.on('swipe', L.bind(window.touch.touchOnly(this._onSwipe), this));
this._hammer.on('hammer.input', window.memo.bind(window.touch.touchOnly(this._onHammer), this));
this._hammer.on('tap', window.memo.bind(window.touch.touchOnly(this._onTap), this));
this._hammer.on('panstart', window.memo.bind(window.touch.touchOnly(this._onPanStart), this));
this._hammer.on('pan', window.memo.bind(window.touch.touchOnly(this._onPan), this));
this._hammer.on('panend', window.memo.bind(window.touch.touchOnly(this._onPanEnd), this));
this._hammer.on('pinchstart', window.memo.bind(window.touch.touchOnly(this._onPinchStart), this));
this._hammer.on('pinchmove', window.memo.bind(window.touch.touchOnly(this._onPinch), this));
this._hammer.on('pinchend', window.memo.bind(window.touch.touchOnly(this._onPinchEnd), this));
this._hammer.on('tripletap', window.memo.bind(window.touch.touchOnly(this._onTripleTap), this));
this._hammer.on('swipe', window.memo.bind(window.touch.touchOnly(this._onSwipe), this));
this._map.on('updatepermission', this._onPermission, this);
this._onPermission({perm: this._map._permission});
},
removeHooks: function () {
this._hammer.off('hammer.input', L.bind(window.touch.touchOnly(this._onHammer), this));
this._hammer.off('tap', L.bind(window.touch.touchOnly(this._onTap), this));
this._hammer.off('panstart', L.bind(window.touch.touchOnly(this._onPanStart), this));
this._hammer.off('pan', L.bind(window.touch.touchOnly(this._onPan), this));
this._hammer.off('panend', L.bind(window.touch.touchOnly(this._onPanEnd), this));
this._hammer.off('pinchstart', L.bind(window.touch.touchOnly(this._onPinchStart), this));
this._hammer.off('pinchmove', L.bind(window.touch.touchOnly(this._onPinch), this));
this._hammer.off('pinchend', L.bind(window.touch.touchOnly(this._onPinchEnd), this));
this._hammer.off('doubletap', L.bind(window.touch.touchOnly(this._onDoubleTap), this));
this._hammer.off('press', L.bind(window.touch.touchOnly(this._onPress), this));
this._hammer.off('tripletap', L.bind(window.touch.touchOnly(this._onTripleTap), this));
this._hammer.off('swipe', L.bind(window.touch.touchOnly(this._onSwipe), this));
this._hammer.off('hammer.input', window.memo.bind(window.touch.touchOnly(this._onHammer), this));
this._hammer.off('tap', window.memo.bind(window.touch.touchOnly(this._onTap), this));
this._hammer.off('panstart', window.memo.bind(window.touch.touchOnly(this._onPanStart), this));
this._hammer.off('pan', window.memo.bind(window.touch.touchOnly(this._onPan), this));
this._hammer.off('panend', window.memo.bind(window.touch.touchOnly(this._onPanEnd), this));
this._hammer.off('pinchstart', window.memo.bind(window.touch.touchOnly(this._onPinchStart), this));
this._hammer.off('pinchmove', window.memo.bind(window.touch.touchOnly(this._onPinch), this));
this._hammer.off('pinchend', window.memo.bind(window.touch.touchOnly(this._onPinchEnd), this));
this._hammer.off('doubletap', window.memo.bind(window.touch.touchOnly(this._onDoubleTap), this));
this._hammer.off('press', window.memo.bind(window.touch.touchOnly(this._onPress), this));
this._hammer.off('tripletap', window.memo.bind(window.touch.touchOnly(this._onTripleTap), this));
this._hammer.off('swipe', window.memo.bind(window.touch.touchOnly(this._onSwipe), this));
this._map.off('updatepermission', this._onPermission, this);
},
_onPermission: function (e) {
if (e.perm == 'edit') {
this._hammer.on('doubletap', L.bind(window.touch.touchOnly(this._onDoubleTap), this));
this._hammer.on('press', L.bind(window.touch.touchOnly(this._onPress), this));
this._hammer.on('doubletap', window.memo.bind(window.touch.touchOnly(this._onDoubleTap), this));
this._hammer.on('press', window.memo.bind(window.touch.touchOnly(this._onPress), this));
} else {
this._hammer.off('doubletap', L.bind(window.touch.touchOnly(this._onDoubleTap), this));
this._hammer.off('press', L.bind(window.touch.touchOnly(this._onPress), this));
this._hammer.off('doubletap', window.memo.bind(window.touch.touchOnly(this._onDoubleTap), this));
this._hammer.off('press', window.memo.bind(window.touch.touchOnly(this._onPress), this));
}
},

4
cypress_test/integration_tests/common/mobile_helper.js
View File

@ -48,7 +48,7 @@ function longPressOnDocument(posX, posY) {
var eventOptions = {
force: true,
button: 0,
pointerType: 'touch',
pointerType: 'mouse',
x: posX - items[0].getBoundingClientRect().left,
y: posY - items[0].getBoundingClientRect().top
};
@ -348,7 +348,7 @@ function deleteImage() {
var eventOptions = {
force: true,
button: 0,
pointerType: 'touch'
pointerType: 'mouse'
};
cy.cGet('.leaflet-control-buttons-disabled > .leaflet-interactive')

2
cypress_test/integration_tests/mobile/calc/delete_objects_spec.js
View File

@ -11,7 +11,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Delete Objects',function()
var eventOptions = {
force: true,
button: 0,
pointerType: 'touch'
pointerType: 'mouse'
};
beforeEach(function() {

2
cypress_test/integration_tests/mobile/calc/image_operation_spec.js
View File

@ -28,7 +28,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Image Operation Tests', fun
var eventOptions = {
force: true,
button: 0,
pointerType: 'touch'
pointerType: 'mouse'
};
cy.cGet('.bottomright-svg-pane > .leaflet-control-buttons-disabled > .leaflet-interactive')

2
cypress_test/integration_tests/mobile/calc/sheet_operation_spec.js
View File

@ -25,7 +25,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Sheet Operation', function
var eventOptions = {
force: true,
button: 0,
pointerType: 'touch'
pointerType: 'mouse'
};
cy.cGet('.spreadsheet-tab.spreadsheet-tab-selected')

2
cypress_test/integration_tests/mobile/impress/delete_objects_spec.js
View File

@ -10,7 +10,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Delete Objects', function()
var eventOptions = {
force: true,
button: 0,
pointerType: 'touch'
pointerType: 'mouse'
};
beforeEach(function() {

2
cypress_test/integration_tests/mobile/writer/delete_objects_spec.js
View File

@ -10,7 +10,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Delete Objects', function()
var eventOptions = {
force: true,
button: 0,
pointerType: 'touch'
pointerType: 'mouse'
};
beforeEach(function() {