aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets
diff options
context:
space:
mode:
authorEric Guzman2012-04-04 11:42:23 -0700
committerEric Guzman2012-04-04 11:42:23 -0700
commitc394a1cf04bbf3b9ad3003ec86498a30d00926bb (patch)
tree52c2b672734d4112f101ec3c8e8e2a61f18ebd4f /js/panels/presets
parent2a5374af0b06e0402498b61985fd3c67d063729b (diff)
parenta11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff)
downloadninja-c394a1cf04bbf3b9ad3003ec86498a30d00926bb.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
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});