diff options
author | Jose Antonio Marquez | 2012-04-04 11:50:54 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-04 11:50:54 -0700 |
commit | 0a469a14757b8cea262c21f652e75c85c9903f4b (patch) | |
tree | c388fdc93e9707e7d66f51ef41eb1d9b366716c7 /js/panels/presets/style-presets.reel/style-presets.js | |
parent | 6034e3aa1d033149ba9ca8f0578e0a95889a7e46 (diff) | |
parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
download | ninja-0a469a14757b8cea262c21f652e75c85c9903f4b.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/panels/presets/style-presets.reel/style-presets.js')
-rw-r--r-- | js/panels/presets/style-presets.reel/style-presets.js | 4 |
1 files changed, 2 insertions, 2 deletions
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 | }); |