diff options
author | Armen Kesablyan | 2012-04-04 11:34:19 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-04-04 11:34:19 -0700 |
commit | 211f514882144de8df69ebb2106f3b446be1dda0 (patch) | |
tree | c8eaf3d9fc7ac1bc841320e73d41818fbfb5827d /js/controllers/presets-controller.js | |
parent | 5a5d0f68dd82b829405a0b301dd11b4cf385c8d5 (diff) | |
parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
download | ninja-211f514882144de8df69ebb2106f3b446be1dda0.tar.gz |
Merge branch 'refs/heads/master' into BugFixes
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 | ||