Fix some animation bugs (#159)

artpolikarpov · Dec 29, 2013 · 3a0b293 · 3a0b293
1 parent 679154e
commit 3a0b293
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/src/js/animate.js b/src/js/animate.js
@@ -1,6 +1,10 @@
 function slide ($el, options) {
-  var elPos = Math.round(options.pos),
-      onEndFn = options.onEnd || noop;
+  var elData = $el.data(),
+      elPos = Math.round(options.pos),
+      onEndFn = function () {
+        elData.sliding = false;
+        (options.onEnd || noop)();
+      };
 
   if (typeof options.overPos !== 'undefined' && options.overPos !== options.pos) {
     elPos = options.overPos;
@@ -13,6 +17,8 @@ function slide ($el, options) {
   var translate = $.extend(getTranslate(elPos, options._001), options.width && {width: options.width});
   console.timeEnd('var translate = $.extend');
 
+  elData.sliding = true;
+
   if (CSS3) {
     $el.css($.extend(getDuration(options.time), translate));
     if (options.time > 10) {

diff --git a/src/js/fotorama.js b/src/js/fotorama.js
@@ -1344,9 +1344,9 @@ jQuery.Fotorama = function ($fotorama, opts) {
       }
       //console.timeEnd('stageShaftTouchTail.onEnd');
     },
-    getPos: function () {
-      return -getPosByIndex(dirtyIndex, measures.w, opts.margin, repositionIndex);
-    },
+//    getPos: function () {
+//      return -getPosByIndex(dirtyIndex, measures.w, opts.margin, repositionIndex);
+//    },
     _001: true,
     timeLow: 1,
     timeHigh: 1,

diff --git a/src/js/moveontouch.js b/src/js/moveontouch.js
@@ -1,5 +1,6 @@
 function moveOnTouch ($el, options) {
   var el = $el[0],
+      elData = $el.data(),
       tail = {},
       startCoo,
       coo,
@@ -14,20 +15,20 @@ function moveOnTouch ($el, options) {
       snap,
       slowFLAG,
       controlFLAG,
-      moved;
+      moved,
+      tracked;
 
   function startTracking (e) {
+    tracked = true;
     startCoo = coo = e._x;
-    startTime = $.now();
+    startTime = e._now;
 
     moveTrack = [
       [startTime, startCoo]
     ];
 
     startElPos = moveElPos = tail.noMove ? 0 : stop($el, (options.getPos || noop)(), options._001);
 
-    // startTime - endTime < TOUCH_TIMEOUT * 3 && e.preventDefault(); // double tap
-
     (options.onStart || noop).call(el, e);
   }
 
@@ -37,25 +38,25 @@ function moveOnTouch ($el, options) {
     snap = tail.snap;
 
     slowFLAG = e.altKey;
-    moved = false;
+    tracked = moved = false;
 
     controlFLAG = result.control;
 
-    if (!controlFLAG) {
+    if (!controlFLAG && !elData.sliding) {
       startTracking(e);
     }
   }
 
   function onMove (e, result) {
-    if (controlFLAG) {
+    if (!tracked) {
       controlFLAG = false;
       startTracking(e);
     }
 
     if (!tail.noSwipe) {
       coo = e._x;
 
-      moveTrack.push([$.now(), coo]);
+      moveTrack.push([e._now, coo]);
 
       moveElPos = startElPos - (startCoo - coo);
 
@@ -84,9 +85,13 @@ function moveOnTouch ($el, options) {
     //console.time('moveontouch.js onEnd');
     if (controlFLAG) return;
 
+    if (!tracked) {
+      startTracking(result.startEvent);
+    }
+
     result.touch || MS_POINTER || $el.removeClass(grabbingClass);
 
-    endTime = new Date().getTime();
+    endTime = $.now();
 
     var _backTimeIdeal = endTime - TOUCH_TIMEOUT,
         _backTime,
@@ -149,7 +154,7 @@ function moveOnTouch ($el, options) {
 
     time *= slowFLAG ? 10 : 1;
 
-    (options.onEnd || noop).call(el, $.extend(result, {pos: moveElPos, newPos: newPos, overPos: overPos, time: time}));
+    (options.onEnd || noop).call(el, $.extend(result, {moved: result.moved || longTouchFLAG && snap, pos: moveElPos, newPos: newPos, overPos: overPos, time: time}));
   }
 
   tail = $.extend(touch(options.$wrap, {

diff --git a/src/js/touch.js b/src/js/touch.js
@@ -7,6 +7,7 @@ function extendEvent (e) {
   var touch = (e.touches || [])[0] || e;
   e._x = touch.pageX;
   e._y = touch.clientY;
+  e._now = $.now();
 }
 
 function touch ($el, options) {