diff options
| author | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-04 15:55:48 -0700 |
| commit | 0681b34b506767b6caf2816b9096bc1a57a17a2d (patch) | |
| tree | 20f10c767efe8d9c5c38fbc2cdb713d093bb279d /js/panels/presets/transitions-presets.reel/transitions-presets.js | |
| parent | f4eccf3e7cb76a14a3546a646575162dbd831538 (diff) | |
| parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
| download | ninja-0681b34b506767b6caf2816b9096bc1a57a17a2d.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
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 | }); |