diff options
author | Eric Guzman | 2012-04-04 11:42:23 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-04 11:42:23 -0700 |
commit | c394a1cf04bbf3b9ad3003ec86498a30d00926bb (patch) | |
tree | 52c2b672734d4112f101ec3c8e8e2a61f18ebd4f /js/controllers/presets-controller.js | |
parent | 2a5374af0b06e0402498b61985fd3c67d063729b (diff) | |
parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
download | ninja-c394a1cf04bbf3b9ad3003ec86498a30d00926bb.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 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js index 7152ba93..0467f73c 100644 --- a/js/controllers/presets-controller.js +++ b/js/controllers/presets-controller.js | |||
@@ -59,16 +59,14 @@ exports.PresetsController = Montage.create(Component, { | |||
59 | }, this); | 59 | }, this); |
60 | 60 | ||
61 | selection.forEach(function(element) { | 61 | selection.forEach(function(element) { |
62 | var el = element._element; | ||
63 | |||
64 | if(useTransition) { | 62 | if(useTransition) { |
65 | this.addTransition(el); | 63 | this.addTransition(element); |
66 | } | 64 | } |
67 | 65 | ||
68 | el.classList.add(selectorBase); | 66 | element.classList.add(selectorBase); |
69 | 67 | ||
70 | //// Keep track of elements with presets and don't add duplicates | 68 | //// Keep track of elements with presets and don't add duplicates |
71 | this.setCachedPreset(el, presetData.id, rules); | 69 | this.setCachedPreset(element, presetData.id, rules); |
72 | 70 | ||
73 | }, this); | 71 | }, this); |
74 | 72 | ||