Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: polymer_0.5.0/bower_components/core-animation/core-animation.html

Issue 786953007: npm_modules: Fork bower_components into Polymer 0.4.0 and 0.5.0 versions (Closed) Base URL: https://chromium.googlesource.com/infra/third_party/npm_modules.git@master
Patch Set: Created 5 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: polymer_0.5.0/bower_components/core-animation/core-animation.html
diff --git a/bower_components/core-animation/core-animation.html b/polymer_0.5.0/bower_components/core-animation/core-animation.html
similarity index 97%
rename from bower_components/core-animation/core-animation.html
rename to polymer_0.5.0/bower_components/core-animation/core-animation.html
index b48040295302d7feaf9b546a29fdbc9b72677125..9a958c9eafadd6dd204e9ca4f62f5862b2727330 100644
--- a/bower_components/core-animation/core-animation.html
+++ b/polymer_0.5.0/bower_components/core-animation/core-animation.html
@@ -62,7 +62,7 @@ Elements that are targets to a `core-animation` are given the `core-animation-ta
@status beta
@homepage github.io
-->
-<polymer-element name="core-animation" constructor="CoreAnimation" attributes="target keyframes sample composite duration fill easing iterationStart iterationCount delay direction autoplay targetSelector">
+<polymer-element name="core-animation" constructor="CoreAnimation" attributes="target keyframes customEffect composite duration fill easing iterationStart iterationCount delay direction autoplay targetSelector">
<script>
(function() {
@@ -80,7 +80,7 @@ Elements that are targets to a `core-animation` are given the `core-animation-ta
/**
*
* Fired when the web animation object changes.
- *
+ *
* @event core-animation-change
*/
@@ -143,11 +143,11 @@ Elements that are targets to a `core-animation` are given the `core-animation-ta
/**
* Controls the effect the animation has on the target when it's not playing.
- * The possible values are "none", "forwards", "backwards", "both" or "auto".
+ * The possible values are "none", "forwards", "backwards", "both" or "auto".
*
* "none" means the animation has no effect when it's not playing.
*
- * "forward" applies the value at the end of the animation after it's finished.
+ * "forwards" applies the value at the end of the animation after it's finished.
*
* "backwards" applies the value at the start of the animation to the target
* before it starts playing and has no effect when the animation finishes.
@@ -429,7 +429,7 @@ Elements that are targets to a `core-animation` are given the `core-animation-ta
frames = this.keyframes;
} else if (!this.customEffect) {
var children = this.querySelectorAll('core-animation-keyframe');
- if (children.length === 0) {
+ if (children.length === 0 && this.shadowRoot) {
children = this.shadowRoot.querySelectorAll('core-animation-keyframe');
}
Array.prototype.forEach.call(children, function(c) {
@@ -439,7 +439,8 @@ Elements that are targets to a `core-animation` are given the `core-animation-ta
if (this.customEffect) {
effect = this.customEffect;
} else {
- effect = new KeyframeEffect(frames, this.composite);
+ // effect = new KeyframeEffect(frames, this.composite);
+ effect = frames;
}
return effect;
},

Powered by Google App Engine
This is Rietveld 408576698