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/panels/presets/animations-presets.reel/animations-presets.js | |
parent | 5a5d0f68dd82b829405a0b301dd11b4cf385c8d5 (diff) | |
parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
download | ninja-211f514882144de8df69ebb2106f3b446be1dda0.tar.gz |
Merge branch 'refs/heads/master' into BugFixes
Diffstat (limited to 'js/panels/presets/animations-presets.reel/animations-presets.js')
-rw-r--r-- | js/panels/presets/animations-presets.reel/animations-presets.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/presets/animations-presets.reel/animations-presets.js b/js/panels/presets/animations-presets.reel/animations-presets.js index 6a16da54..92437cfd 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.js +++ b/js/panels/presets/animations-presets.reel/animations-presets.js | |||
@@ -23,6 +23,6 @@ exports.AnimationsLibrary = Montage.create(Component, { | |||
23 | handleNodeActivation: { | 23 | handleNodeActivation: { |
24 | value: function(presetData) { | 24 | value: function(presetData) { |
25 | this.application.ninja.presetsController.applyPreset(presetData); | 25 | this.application.ninja.presetsController.applyPreset(presetData); |
26 | } | 26 | } |
27 | } | 27 | } |
28 | }); | 28 | }); |