aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/transitions-presets.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-04-04 13:20:15 -0700
committerAnanya Sen2012-04-04 13:20:15 -0700
commit22ade57a30b45774882028eef4ab5a5bffe1a624 (patch)
tree52e589450eeb8adf7e11b66bd222fec5fa66c963 /js/panels/presets/transitions-presets.reel
parentbec4cde986975d1cc5f1d2791fdb18548fc2d72a (diff)
parent8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff)
downloadninja-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.js4
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});