Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug with rotation when add a value for threshold to avoid map bei… #1127

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug with rotation when add a value for threshold to avoid map bei… #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 67 additions & 132 deletions hammer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! Hammer.JS - v2.0.8 - 2016-09-30
/*! Hammer.JS - v2.0.8 - 2017-07-24
* http://hammerjs.github.io/
*
* Copyright (c) Jorik Tangelder;
Expand Down Expand Up @@ -237,118 +237,15 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
};

var asyncGenerator = function () {
function AwaitValue(value) {
this.value = value;
}

function AsyncGenerator(gen) {
var front, back;

function send(key, arg) {
return new Promise(function (resolve, reject) {
var request = {
key: key,
arg: arg,
resolve: resolve,
reject: reject,
next: null
};

if (back) {
back = back.next = request;
} else {
front = back = request;
resume(key, arg);
}
});
}

function resume(key, arg) {
try {
var result = gen[key](arg);
var value = result.value;

if (value instanceof AwaitValue) {
Promise.resolve(value.value).then(function (arg) {
resume("next", arg);
}, function (arg) {
resume("throw", arg);
});
} else {
settle(result.done ? "return" : "normal", result.value);
}
} catch (err) {
settle("throw", err);
}
}

function settle(type, value) {
switch (type) {
case "return":
front.resolve({
value: value,
done: true
});
break;

case "throw":
front.reject(value);
break;

default:
front.resolve({
value: value,
done: false
});
break;
}

front = front.next;

if (front) {
resume(front.key, front.arg);
} else {
back = null;
}
}

this._invoke = send;

if (typeof gen.return !== "function") {
this.return = undefined;
}
}

if (typeof Symbol === "function" && Symbol.asyncIterator) {
AsyncGenerator.prototype[Symbol.asyncIterator] = function () {
return this;
};
}

AsyncGenerator.prototype.next = function (arg) {
return this._invoke("next", arg);
};

AsyncGenerator.prototype.throw = function (arg) {
return this._invoke("throw", arg);
};

AsyncGenerator.prototype.return = function (arg) {
return this._invoke("return", arg);
};

return {
wrap: function (fn) {
return function () {
return new AsyncGenerator(fn.apply(this, arguments));
};
},
await: function (value) {
return new AwaitValue(value);
}
};
}();

var classCallCheck = function (instance, Constructor) {
if (!(instance instanceof Constructor)) {
Expand All @@ -374,7 +271,13 @@ var createClass = function () {
};
}();

var get = function get(object, property, receiver) {






var get$1 = function get$1(object, property, receiver) {
if (object === null) object = Function.prototype;
var desc = Object.getOwnPropertyDescriptor(object, property);

Expand All @@ -384,7 +287,7 @@ var get = function get(object, property, receiver) {
if (parent === null) {
return undefined;
} else {
return get(parent, property, receiver);
return get$1(parent, property, receiver);
}
} else if ("value" in desc) {
return desc.value;
Expand Down Expand Up @@ -415,6 +318,16 @@ var inherits = function (subClass, superClass) {
if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
};











var possibleConstructorReturn = function (self, call) {
if (!self) {
throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
Expand All @@ -423,6 +336,30 @@ var possibleConstructorReturn = function (self, call) {
return call && (typeof call === "object" || typeof call === "function") ? call : self;
};



var set$1 = function set$1(object, property, value, receiver) {
var desc = Object.getOwnPropertyDescriptor(object, property);

if (desc === undefined) {
var parent = Object.getPrototypeOf(object);

if (parent !== null) {
set$1(parent, property, value, receiver);
}
} else if ("value" in desc && desc.writable) {
desc.value = value;
} else {
var setter = desc.set;

if (setter !== undefined) {
setter.call(receiver, value);
}
}

return value;
};

var slicedToArray = function () {
function sliceIterator(arr, i) {
var _arr = [];
Expand Down Expand Up @@ -947,7 +884,7 @@ var RotateRecognizer = function (_AttrRecognizer) {
}, {
key: 'attrTest',
value: function attrTest(input) {
return get(RotateRecognizer.prototype.__proto__ || Object.getPrototypeOf(RotateRecognizer.prototype), 'attrTest', this).call(this, input) && (Math.abs(input.rotation) > this.options.threshold || this.state & STATE_BEGAN);
return get$1(RotateRecognizer.prototype.__proto__ || Object.getPrototypeOf(RotateRecognizer.prototype), 'attrTest', this).call(this, input) && (Math.abs(input.rotation) > this.options.threshold || this.state & STATE_BEGAN);
}
}]);
return RotateRecognizer;
Expand Down Expand Up @@ -983,7 +920,7 @@ var PinchRecognizer = function (_AttrRecognizer) {
}, {
key: 'attrTest',
value: function attrTest(input) {
return get(PinchRecognizer.prototype.__proto__ || Object.getPrototypeOf(PinchRecognizer.prototype), 'attrTest', this).call(this, input) && (Math.abs(input.scale - 1) > this.options.threshold || this.state & STATE_BEGAN);
return get$1(PinchRecognizer.prototype.__proto__ || Object.getPrototypeOf(PinchRecognizer.prototype), 'attrTest', this).call(this, input) && (Math.abs(input.scale - 1) > this.options.threshold || this.state & STATE_BEGAN);
}
}, {
key: 'emit',
Expand All @@ -992,7 +929,7 @@ var PinchRecognizer = function (_AttrRecognizer) {
var inOut = input.scale < 1 ? 'in' : 'out';
input.additionalEvent = this.options.event + inOut;
}
get(PinchRecognizer.prototype.__proto__ || Object.getPrototypeOf(PinchRecognizer.prototype), 'emit', this).call(this, input);
get$1(PinchRecognizer.prototype.__proto__ || Object.getPrototypeOf(PinchRecognizer.prototype), 'emit', this).call(this, input);
}
}]);
return PinchRecognizer;
Expand Down Expand Up @@ -1103,7 +1040,7 @@ var PanRecognizer = function (_AttrRecognizer) {
if (direction) {
input.additionalEvent = this.options.event + direction;
}
get(PanRecognizer.prototype.__proto__ || Object.getPrototypeOf(PanRecognizer.prototype), 'emit', this).call(this, input);
get$1(PanRecognizer.prototype.__proto__ || Object.getPrototypeOf(PanRecognizer.prototype), 'emit', this).call(this, input);
}
}]);
return PanRecognizer;
Expand Down Expand Up @@ -1152,7 +1089,7 @@ var SwipeRecognizer = function (_AttrRecognizer) {
velocity = input.overallVelocityY;
}

return get(SwipeRecognizer.prototype.__proto__ || Object.getPrototypeOf(SwipeRecognizer.prototype), 'attrTest', this).call(this, input) && direction & input.offsetDirection && input.distance > this.options.threshold && input.maxPointers === this.options.pointers && abs(velocity) > this.options.velocity && input.eventType & INPUT_END;
return get$1(SwipeRecognizer.prototype.__proto__ || Object.getPrototypeOf(SwipeRecognizer.prototype), 'attrTest', this).call(this, input) && direction & input.offsetDirection && input.distance > this.options.threshold && input.maxPointers === this.options.pointers && abs(velocity) > this.options.velocity && input.eventType & INPUT_END;
}
}, {
key: 'emit',
Expand Down Expand Up @@ -1783,7 +1720,7 @@ function getScale(start, end) {
* @return {Number} rotation
*/
function getRotation(start, end) {
return getAngle(end[1], end[0], PROPS_CLIENT_XY) + getAngle(start[1], start[0], PROPS_CLIENT_XY);
return getAngle(end[1], end[0], PROPS_CLIENT_XY) - getAngle(start[1], start[0], PROPS_CLIENT_XY);
}

/**
Expand Down Expand Up @@ -1849,8 +1786,8 @@ function computeInputData(manager, input) {
session.firstMultiple = false;
}

var firstInput = session.firstInput;
var firstMultiple = session.firstMultiple;
var firstInput = session.firstInput,
firstMultiple = session.firstMultiple;

var offsetCenter = firstMultiple ? firstMultiple.center : firstInput.center;

Expand Down Expand Up @@ -2448,25 +2385,20 @@ function recordTouches(eventType, eventData) {
}

function setLastTouch(eventData) {
var _this2 = this;

var _eventData$changedPoi = slicedToArray(eventData.changedPointers, 1);

var touch = _eventData$changedPoi[0];
var _eventData$changedPoi = slicedToArray(eventData.changedPointers, 1),
touch = _eventData$changedPoi[0];

if (touch.identifier === this.primaryTouch) {
(function () {
var lastTouch = { x: touch.clientX, y: touch.clientY };
_this2.lastTouches.push(lastTouch);
var lts = _this2.lastTouches;
var removeLastTouch = function removeLastTouch() {
var i = lts.indexOf(lastTouch);
if (i > -1) {
lts.splice(i, 1);
}
};
setTimeout(removeLastTouch, DEDUP_TIMEOUT);
})();
var lastTouch = { x: touch.clientX, y: touch.clientY };
this.lastTouches.push(lastTouch);
var lts = this.lastTouches;
var removeLastTouch = function removeLastTouch() {
var i = lts.indexOf(lastTouch);
if (i > -1) {
lts.splice(i, 1);
}
};
setTimeout(removeLastTouch, DEDUP_TIMEOUT);
}
}

Expand Down Expand Up @@ -3226,6 +3158,9 @@ assign$1(Hammer, {
removeEventListeners: removeEventListeners
});

var freeGlobal = typeof window !== 'undefined' ? window : typeof self !== 'undefined' ? self : {}; // jshint ignore:line
freeGlobal.Hammer = Hammer;

/* jshint ignore:start */
if (typeof define === 'function' && define.amd) {
define(function () {
Expand All @@ -3237,4 +3172,4 @@ if (typeof define === 'function' && define.amd) {
window[exportName] = Hammer;
}
/* jshint ignore:end */
})(window, document, 'Hammer');
})(window, document, 'Hammer');
6 changes: 3 additions & 3 deletions hammer.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion hammer.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/inputjs/get-rotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ import { PROPS_CLIENT_XY } from './input-consts';
* @return {Number} rotation
*/
export default function getRotation(start, end) {
return getAngle(end[1], end[0], PROPS_CLIENT_XY) + getAngle(start[1], start[0], PROPS_CLIENT_XY);
return getAngle(end[1], end[0], PROPS_CLIENT_XY) - getAngle(start[1], start[0], PROPS_CLIENT_XY);
}