From ffe0e09002a5a3bc6b37593f59bc63b16e315862 Mon Sep 17 00:00:00 2001
From: Tim Dresser <tdresser@chromium.org>
Date: Thu, 13 Mar 2014 13:43:30 -0400
Subject: [PATCH] Fix bug with aborted fling animations.

---
 polymer-p2r.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/polymer-p2r.js b/polymer-p2r.js
index aabe1b6..a0584a5 100644
--- a/polymer-p2r.js
+++ b/polymer-p2r.js
@@ -136,9 +136,9 @@ Polymer('polymer-p2r', {
       loading = false;
       if (pulling) {
         setHeaderClassName('');
-        startY -= loadingOffset;
         checkPulled();
-      } else if (isP2rVisible()) {
+      }
+      if (isP2rVisible()) {
         setAnimationEnabled(true);
         overscrollOffset = scroller.scrollTop;
         scheduleUpdate();
@@ -146,6 +146,11 @@ Polymer('polymer-p2r', {
     }
 
     scroller.addEventListener('touchstart', function(e) {
+      if (inFlingAnimation) {
+        scrollcontent.removeEventListener('webkitTransitionEnd', firstEnd);
+        scrollcontent.addEventListener('webkitTransitionEnd', secondEnd);
+        scroller.addEventListener('scroll', onScrollEvent);
+      }
       inFlingAnimation = false;
       fingersDown++;
       seenTouchMoveThisSequence = false;