diff options
author | Ananya Sen | 2012-04-04 13:20:15 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-04 13:20:15 -0700 |
commit | 22ade57a30b45774882028eef4ab5a5bffe1a624 (patch) | |
tree | 52e589450eeb8adf7e11b66bd222fec5fa66c963 /js/panels/presets/transitions-presets.reel | |
parent | bec4cde986975d1cc5f1d2791fdb18548fc2d72a (diff) | |
parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
download | ninja-22ade57a30b45774882028eef4ab5a5bffe1a624.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Codeview-improvements
Diffstat (limited to 'js/panels/presets/transitions-presets.reel')
-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 | }); |