aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-05 11:47:16 -0700
committerValerio Virgillito2012-04-05 11:47:16 -0700
commit7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (patch)
tree52cbbae732ce4dc335ddf237106aff988ddccd08 /js
parentc00f59e9484580c07cd812f0578b920229228054 (diff)
parentb9d1eb3e330e486a31ba5d7de6902d8f5b023860 (diff)
downloadninja-7656b6eac7aec59697c6cddbe2a507fe9e4aa187.tar.gz
Merge pull request #155 from ericguzman/PresetsPI
Presets controller - update for "_element" removal in selection objects
Diffstat (limited to 'js')
-rw-r--r--js/controllers/presets-controller.js9
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