aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorArmen Kesablyan2012-04-04 11:34:19 -0700
committerArmen Kesablyan2012-04-04 11:34:19 -0700
commit211f514882144de8df69ebb2106f3b446be1dda0 (patch)
treec8eaf3d9fc7ac1bc841320e73d41818fbfb5827d /js/panels/presets
parent5a5d0f68dd82b829405a0b301dd11b4cf385c8d5 (diff)
parenta11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff)
downloadninja-211f514882144de8df69ebb2106f3b446be1dda0.tar.gz
Merge branch 'refs/heads/master' into BugFixes
Diffstat (limited to 'js/panels/presets')
-rw-r--r--js/panels/presets/animations-presets.reel/animations-presets.js4
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js4
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.js4
3 files changed, 6 insertions, 6 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});
diff --git a/js/panels/presets/style-presets.reel/style-presets.js b/js/panels/presets/style-presets.reel/style-presets.js
index 6a28e069..5f10bbe3 100644
--- a/js/panels/presets/style-presets.reel/style-presets.js
+++ b/js/panels/presets/style-presets.reel/style-presets.js
@@ -23,12 +23,12 @@ exports.StylesLibrary = Montage.create(Component, {
23 handleNodeActivation: { 23 handleNodeActivation: {
24 value: function(presetData) { 24 value: function(presetData) {
25 this.application.ninja.presetsController.applyPreset(presetData, true); 25 this.application.ninja.presetsController.applyPreset(presetData, true);
26 } 26 }
27 }, 27 },
28 handleDragEnd : { 28 handleDragEnd : {
29 value: function(sourceObject) { 29 value: function(sourceObject) {
30 console.log(sourceObject); 30 console.log(sourceObject);
31 } 31 }
32 } 32 }
33 33
34}); 34});
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});