Fix bug with aborted fling animations.

tdresser · Mar 13, 2014 · ffe0e09 · ffe0e09
1 parent 4c42869
commit ffe0e09
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/polymer-p2r.js b/polymer-p2r.js
@@ -136,16 +136,21 @@ Polymer('polymer-p2r', {
       loading = false;
       if (pulling) {
         setHeaderClassName('');
-        startY -= loadingOffset;
         checkPulled();
-      } else if (isP2rVisible()) {
+      }
+      if (isP2rVisible()) {
         setAnimationEnabled(true);
         overscrollOffset = scroller.scrollTop;
         scheduleUpdate();
       }
     }
 
     scroller.addEventListener('touchstart', function(e) {
+      if (inFlingAnimation) {
+        scrollcontent.removeEventListener('webkitTransitionEnd', firstEnd);
+        scrollcontent.addEventListener('webkitTransitionEnd', secondEnd);
+        scroller.addEventListener('scroll', onScrollEvent);
+      }
       inFlingAnimation = false;
       fingersDown++;
       seenTouchMoveThisSequence = false;