diff options
author | Valerio Virgillito | 2012-04-04 13:27:40 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-04 13:27:40 -0700 |
commit | 9f1806a7134ec4744a8009e6a7467f5cea04cabf (patch) | |
tree | b4038b10cb105cc9860f869e6bb372a74b05813c /js/panels/presets/transitions-presets.reel/transitions-presets.js | |
parent | 56a042a8ed5d1cb2cb82781952f09ffd6a8338ea (diff) | |
parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
download | ninja-9f1806a7134ec4744a8009e6a7467f5cea04cabf.tar.gz |
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'js/panels/presets/transitions-presets.reel/transitions-presets.js')
-rw-r--r-- | js/panels/presets/transitions-presets.reel/transitions-presets.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.js b/js/panels/presets/transitions-presets.reel/transitions-presets.js index ace38dbb..4ca2a662 100644 --- a/js/panels/presets/transitions-presets.reel/transitions-presets.js +++ b/js/panels/presets/transitions-presets.reel/transitions-presets.js | |||
@@ -23,6 +23,6 @@ exports.TransitionsLibrary = 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 | }); |