From 93c91a5f85e9477b1b3f802717d0e834834d47c6 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 24 Apr 2015 20:04:49 +0200 Subject: [PATCH 1/2] Reset dragged pane Y position to its default state --- js/jquery.jTinder.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/jquery.jTinder.js b/js/jquery.jTinder.js index 7e72403..32c2bfe 100644 --- a/js/jquery.jTinder.js +++ b/js/jquery.jTinder.js @@ -24,6 +24,7 @@ var $that = null; var xStart = 0; var yStart = 0; + var paneYStart = 0; var touchStart = false; var posX = 0, posY = 0, lastPosX = 0, lastPosY = 0, pane_width = 0, pane_count = 0, current_pane = 0; @@ -88,12 +89,14 @@ touchStart = true; xStart = ev.originalEvent.touches[0].pageX; yStart = ev.originalEvent.touches[0].pageY; + paneYStart = $(panes.eq(current_pane)).position().top; } case 'mousedown': if(touchStart === false) { touchStart = true; xStart = ev.pageX; yStart = ev.pageY; + paneYStart = $(panes.eq(current_pane)).position().top; } case 'mousemove': case 'touchmove': @@ -153,9 +156,10 @@ } else { lastPosX = 0; lastPosY = 0; - panes.eq(current_pane).animate({"transform": "translate(0px,0px) rotate(0deg)"}, $that.settings.animationRevertSpeed); + panes.eq(current_pane).animate({"transform": "translate(0px,"+paneYStart+"px) rotate(0deg)"}, $that.settings.animationRevertSpeed); panes.eq(current_pane).find($that.settings.likeSelector).animate({"opacity": 0}, $that.settings.animationRevertSpeed); panes.eq(current_pane).find($that.settings.dislikeSelector).animate({"opacity": 0}, $that.settings.animationRevertSpeed); + paneYStart = 0 } break; } From 007e56ab2b1c00f021694a95d4c46df62810c571 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 8 May 2015 23:05:03 +0200 Subject: [PATCH 2/2] Add rotationRatio options --- js/jquery.jTinder.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/jquery.jTinder.js b/js/jquery.jTinder.js index 32c2bfe..14f86e4 100644 --- a/js/jquery.jTinder.js +++ b/js/jquery.jTinder.js @@ -16,7 +16,8 @@ animationSpeed: 400, threshold: 1, likeSelector: '.like', - dislikeSelector: '.dislike' + dislikeSelector: '.dislike', + rotationRatio: 8, }; var container = null; @@ -105,7 +106,7 @@ var pageY = typeof ev.pageY == 'undefined' ? ev.originalEvent.touches[0].pageY : ev.pageY; var deltaX = parseInt(pageX) - parseInt(xStart); var deltaY = parseInt(pageY) - parseInt(yStart); - var percent = ((100 / pane_width) * deltaX) / pane_count; + var percent = ((100 / pane_width) * deltaX) / $that.settings.rotationRatio; posX = deltaX + lastPosX; posY = deltaY + lastPosY;