Index: third_party/polymer/v1_0/components-chromium/neon-animation/animations/ripple-animation-extracted.js |
diff --git a/third_party/polymer/v1_0/components-chromium/neon-animation/animations/ripple-animation-extracted.js b/third_party/polymer/v1_0/components-chromium/neon-animation/animations/ripple-animation-extracted.js |
index c7e8c715e4d8050bbc8dadf897c67c5b5f58cde3..96b4b812baa13917d8c479a2ecdce01fa20a57b9 100644 |
--- a/third_party/polymer/v1_0/components-chromium/neon-animation/animations/ripple-animation-extracted.js |
+++ b/third_party/polymer/v1_0/components-chromium/neon-animation/animations/ripple-animation-extracted.js |
@@ -8,8 +8,8 @@ |
Polymer.NeonSharedElementAnimationBehavior |
], |
- configure: function(config, fromPage, toPage) { |
- var shared = this.findSharedElements(config, fromPage, toPage); |
+ configure: function(config) { |
+ var shared = this.findSharedElements(config); |
if (!shared) { |
return null; |
} |
@@ -18,11 +18,11 @@ |
var toRect = shared.to.getBoundingClientRect(); |
if (config.gesture) { |
translateX = config.gesture.x - (toRect.left + (toRect.width / 2)); |
- translateY = config.gesture.y - (toRect.left + (toRect.height / 2)); |
+ translateY = config.gesture.y - (toRect.top + (toRect.height / 2)); |
} else { |
var fromRect = shared.from.getBoundingClientRect(); |
translateX = (fromRect.left + (fromRect.width / 2)) - (toRect.left + (toRect.width / 2)); |
- translateY = (fromRect.top + (fromRect.height / 2)) - (toRect.left + (toRect.height / 2)); |
+ translateY = (fromRect.top + (fromRect.height / 2)) - (toRect.top + (toRect.height / 2)); |
} |
var translate = 'translate(' + translateX + 'px,' + translateY + 'px)'; |