third_party/polymer/v1_0/components-chromium/neon-animation/animations/scale-up-animation-extracted.js - Issue 1221923003: Update bower.json for Polymer elements and add PRESUBMIT.py

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/polymer/v1_0/components-chromium/neon-animation/animations/scale-up-animation-extracted.js

Issue 1221923003: Update bower.json for Polymer elements and add PRESUBMIT.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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

« third_party/polymer/v1_0/PRESUBMIT.py ('K') | « third_party/polymer/v1_0/components-chromium/neon-animation/animations/ripple-animation-extracted.js ('k') | third_party/polymer/v1_0/components-chromium/neon-animation/animations/transform-animation.html » ('j') | third_party/polymer/v1_0/components/paper-toast/paper-toast.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/polymer/v1_0/components-chromium/neon-animation/animations/scale-up-animation-extracted.js

diff --git a/third_party/polymer/v1_0/components-chromium/neon-animation/animations/scale-up-animation-extracted.js b/third_party/polymer/v1_0/components-chromium/neon-animation/animations/scale-up-animation-extracted.js

index a63aad6ba0dc92fcf11453905fb6fcf18100df6e..c94708c1faeaf217d9e7fb73c5f2757519fc1c20 100644

--- a/third_party/polymer/v1_0/components-chromium/neon-animation/animations/scale-up-animation-extracted.js

+++ b/third_party/polymer/v1_0/components-chromium/neon-animation/animations/scale-up-animation-extracted.js

@@ -15,9 +15,16 @@

this.setPrefixedProperty(node, 'transformOrigin', config.transformOrigin);

}

+ var scaleProperty = 'scale(0)';

+ if (config.axis === 'x') {

+ scaleProperty = 'scale(0, 1)';

+ } else if (config.axis === 'y') {

+ scaleProperty = 'scale(1, 0)';

+ }

this._effect = new KeyframeEffect(node, [

- {'transform': 'scale(0)'},

- {'transform': 'scale(1)'}

+ {'transform': scaleProperty},

+ {'transform': 'scale(1, 1)'}

], this.timingFromConfig(config));

return this._effect;