diff options
author | Ananya Sen | 2012-04-17 18:11:55 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-17 18:11:55 -0700 |
commit | 35abad196cc9feb76ef50c1b63032a38233a6d51 (patch) | |
tree | 914689c66d4ab6c6e088b571eade0a0e35082916 /js/controllers/presets-controller.js | |
parent | 1f891c58bad0b7746659aa4138001b5ee76d9a0e (diff) | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-35abad196cc9feb76ef50c1b63032a38233a6d51.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/controllers/presets-controller.js')
-rw-r--r-- | js/controllers/presets-controller.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js index 975f9f7a..4c177189 100644 --- a/js/controllers/presets-controller.js +++ b/js/controllers/presets-controller.js | |||
@@ -72,20 +72,19 @@ exports.PresetsController = Montage.create(Component, { | |||
72 | selectorBase = stylesController.generateClassName(selectorBase); | 72 | selectorBase = stylesController.generateClassName(selectorBase); |
73 | 73 | ||
74 | selection.forEach(function(element) { | 74 | selection.forEach(function(element) { |
75 | var el = element._element, | 75 | var animationName; |
76 | animationName; | ||
77 | 76 | ||
78 | if(useTransition) { | 77 | if(useTransition) { |
79 | this.addTransition(el); | 78 | this.addTransition(element); |
80 | } | 79 | } |
81 | 80 | ||
82 | ///// TODO: remove when we find out what to do with competing animations | 81 | ///// TODO: remove when we find out what to do with competing animations |
83 | animationName = stylesController.getElementStyle(el, '-webkit-animation-name'); | 82 | animationName = stylesController.getElementStyle(element, '-webkit-animation-name'); |
84 | if(animationName) { | 83 | if(animationName) { |
85 | animationNames.push(animationName); | 84 | animationNames.push(animationName); |
86 | } | 85 | } |
87 | 86 | ||
88 | el.classList.add(selectorBase); | 87 | element.classList.add(selectorBase); |
89 | 88 | ||
90 | }, this); | 89 | }, this); |
91 | 90 | ||