diff options
author | Eric Guzman | 2012-04-05 18:42:40 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-05 18:42:40 -0700 |
commit | 8ff9dde2053e41d85bb27d9c91808a30e551a138 (patch) | |
tree | 8eec67d632d82d3052ed470096eda13fd50a55c8 /js/controllers/presets-controller.js | |
parent | 4631d54ffb4942378835689e9f5d70ed95610822 (diff) | |
parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
download | ninja-8ff9dde2053e41d85bb27d9c91808a30e551a138.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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 | ||