Skip to content

I
i20rzslider
Commit de1ba55d authored by Valentin Hervieu's avatar Valentin Hervieu
Browse files
Options

Fix onEnd event being sent several times on non-mobiles devices

parent 88e31f53
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 25 deletions
dist/rzslider.js
View file @ de1ba55d
...@@ -1777,12 +1777,10 @@ ...@@ -1777,12 +1777,10 @@
this.focusElement(pointer); this.focusElement(pointer);
ehMove = angular.bind(this, this.dragging.active ? this.onDragMove : this.onMove, pointer); ehMove = angular.bind(this, this.dragging.active ? this.onDragMove : this.onMove, pointer);
ehEnd = angular.bind(this, this.onEnd, ehMove); ehEnd = angular.bind(this, this.onEnd, ehMove, ehEnd);
$document.on(eventNames.moveEvent, ehMove);
$document.on(eventNames.moveEvent, ehMove)
$document.on(eventNames.endEvent, ehEnd); $document.on(eventNames.endEvent, ehEnd);
this.ehEndToBeRemovedOnEnd = ehEnd;
this.callOnStart(); this.callOnStart();
var changedTouches = this.getEventAttr(event, 'changedTouches'); var changedTouches = this.getEventAttr(event, 'changedTouches');
...@@ -1842,10 +1840,11 @@ ...@@ -1842,10 +1840,11 @@
* onEnd event handler * onEnd event handler
* *
* @param {Event} event The event * @param {Event} event The event
* @param {Function} ehMove The the bound move event handler * @param {Function} ehMove The bound move event handler
* @param {Function} ehEnd The bound end event handler
* @returns {undefined} * @returns {undefined}
*/ */
onEnd: function(ehMove, event) { onEnd: function(ehMove, ehEnd, event) {
var changedTouches = this.getEventAttr(event, 'changedTouches'); var changedTouches = this.getEventAttr(event, 'changedTouches');
if (changedTouches && changedTouches[0].identifier !== this.touchId) { if (changedTouches && changedTouches[0].identifier !== this.touchId) {
return; return;
...@@ -1853,11 +1852,6 @@ ...@@ -1853,11 +1852,6 @@
this.isDragging = false; this.isDragging = false;
this.touchId = null; this.touchId = null;
// Touch event, the listener was added by us so we need to remove it
$document.off("touchend", this.ehEndToBeRemovedOnEnd);
var moveEventName = this.getEventNames(event).moveEvent;
if (!this.options.keyboardSupport) { if (!this.options.keyboardSupport) {
this.minH.removeClass('rz-active'); this.minH.removeClass('rz-active');
this.maxH.removeClass('rz-active'); this.maxH.removeClass('rz-active');
...@@ -1865,7 +1859,9 @@ ...@@ -1865,7 +1859,9 @@
} }
this.dragging.active = false; this.dragging.active = false;
$document.off(moveEventName, ehMove); var eventName = this.getEventNames(event);
$document.off(eventName.moveEvent, ehMove);
$document.off(eventName.endEvent, ehEnd);
this.callOnEnd(); this.callOnEnd();
}, },
......
dist/rzslider.min.js
View file @ de1ba55d
This diff is collapsed.
src/rzslider.js
View file @ de1ba55d
...@@ -1781,12 +1781,10 @@ ...@@ -1781,12 +1781,10 @@
this.focusElement(pointer); this.focusElement(pointer);
ehMove = angular.bind(this, this.dragging.active ? this.onDragMove : this.onMove, pointer); ehMove = angular.bind(this, this.dragging.active ? this.onDragMove : this.onMove, pointer);
ehEnd = angular.bind(this, this.onEnd, ehMove); ehEnd = angular.bind(this, this.onEnd, ehMove, ehEnd);
$document.on(eventNames.moveEvent, ehMove);
$document.on(eventNames.moveEvent, ehMove)
$document.on(eventNames.endEvent, ehEnd); $document.on(eventNames.endEvent, ehEnd);
this.ehEndToBeRemovedOnEnd = ehEnd;
this.callOnStart(); this.callOnStart();
var changedTouches = this.getEventAttr(event, 'changedTouches'); var changedTouches = this.getEventAttr(event, 'changedTouches');
...@@ -1846,10 +1844,11 @@ ...@@ -1846,10 +1844,11 @@
* onEnd event handler * onEnd event handler
* *
* @param {Event} event The event * @param {Event} event The event
* @param {Function} ehMove The the bound move event handler * @param {Function} ehMove The bound move event handler
* @param {Function} ehEnd The bound end event handler
* @returns {undefined} * @returns {undefined}
*/ */
onEnd: function(ehMove, event) { onEnd: function(ehMove, ehEnd, event) {
var changedTouches = this.getEventAttr(event, 'changedTouches'); var changedTouches = this.getEventAttr(event, 'changedTouches');
if (changedTouches && changedTouches[0].identifier !== this.touchId) { if (changedTouches && changedTouches[0].identifier !== this.touchId) {
return; return;
...@@ -1857,11 +1856,6 @@ ...@@ -1857,11 +1856,6 @@
this.isDragging = false; this.isDragging = false;
this.touchId = null; this.touchId = null;
// Touch event, the listener was added by us so we need to remove it
$document.off("touchend", this.ehEndToBeRemovedOnEnd);
var moveEventName = this.getEventNames(event).moveEvent;
if (!this.options.keyboardSupport) { if (!this.options.keyboardSupport) {
this.minH.removeClass('rz-active'); this.minH.removeClass('rz-active');
this.maxH.removeClass('rz-active'); this.maxH.removeClass('rz-active');
...@@ -1869,7 +1863,9 @@ ...@@ -1869,7 +1863,9 @@
} }
this.dragging.active = false; this.dragging.active = false;
$document.off(moveEventName, ehMove); var eventName = this.getEventNames(event);
$document.off(eventName.moveEvent, ehMove);
$document.off(eventName.endEvent, ehEnd);
this.callOnEnd(); this.callOnEnd();
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment