photowall/image-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P5-1900. Fix for imager editor dragbars on Android devices.

Browse Source
This commit is contained in:
EricaWind
2017-11-14 14:12:51 +02:00
parent 9c91d02833
commit 59f8dfd8bc
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/image-editor.js
Vendored
+7 -3
View File
@@ -653,14 +653,18 @@ var DragHandle = function (handler) {
return; return;
} }
//Android devices have different structure of TouchEvent so e.e.touches[0] element uses in this case
var pageX = (typeof e.e.pageX !== 'undefined' ? e.e.pageX : e.e.touches[0].pageX);
var pageY = (typeof e.e.pageY !== 'undefined' ? e.e.pageY : e.e.touches[0].pageY);
// We're using a polyfill to calculate moude/touch movement if the browser/device // We're using a polyfill to calculate moude/touch movement if the browser/device
// does not support movementX/movementY. // does not support movementX/movementY.
var previousMouseData = util.MouseMetrics.previousMouseData; var previousMouseData = util.MouseMetrics.previousMouseData;
var movement = { var movement = {
x: 'movementX' in e.e ? e.e.movementX : (previousMouseData.x ? e.e.pageX - previousMouseData.x : 0), x: 'movementX' in e.e ? e.e.movementX : (previousMouseData.x ? pageX - previousMouseData.x : 0),
y: 'movementY' in e.e ? e.e.movementY : (previousMouseData.y ? e.e.pageY - previousMouseData.y : 0) y: 'movementY' in e.e ? e.e.movementY : (previousMouseData.y ? pageY - previousMouseData.y : 0)
}; };
util.MouseMetrics.setPreviousMouseData({x: e.e.pageX, y: e.e.pageY}); util.MouseMetrics.setPreviousMouseData({x: pageX, y: pageY});
_movedHandle = true; _movedHandle = true;
if (_currentAxis === 'x') { if (_currentAxis === 'x') {
src/DragHandle.js
+7 -3
View File
@@ -37,14 +37,18 @@ var DragHandle = function (handler) {
return; return;
} }
//Android devices have different structure of TouchEvent so e.e.touches[0] element uses in this case
var pageX = (typeof e.e.pageX !== 'undefined' ? e.e.pageX : e.e.touches[0].pageX);
var pageY = (typeof e.e.pageY !== 'undefined' ? e.e.pageY : e.e.touches[0].pageY);
// We're using a polyfill to calculate moude/touch movement if the browser/device // We're using a polyfill to calculate moude/touch movement if the browser/device
// does not support movementX/movementY. // does not support movementX/movementY.
var previousMouseData = util.MouseMetrics.previousMouseData; var previousMouseData = util.MouseMetrics.previousMouseData;
var movement = { var movement = {
x: 'movementX' in e.e ? e.e.movementX : (previousMouseData.x ? e.e.pageX - previousMouseData.x : 0), x: 'movementX' in e.e ? e.e.movementX : (previousMouseData.x ? pageX - previousMouseData.x : 0),
y: 'movementY' in e.e ? e.e.movementY : (previousMouseData.y ? e.e.pageY - previousMouseData.y : 0) y: 'movementY' in e.e ? e.e.movementY : (previousMouseData.y ? pageY - previousMouseData.y : 0)
}; };
util.MouseMetrics.setPreviousMouseData({x: e.e.pageX, y: e.e.pageY}); util.MouseMetrics.setPreviousMouseData({x: pageX, y: pageY});
_movedHandle = true; _movedHandle = true;
if (_currentAxis === 'x') { if (_currentAxis === 'x') {