diff options
author | Eric Guzman | 2012-04-04 11:42:23 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-04 11:42:23 -0700 |
commit | c394a1cf04bbf3b9ad3003ec86498a30d00926bb (patch) | |
tree | 52c2b672734d4112f101ec3c8e8e2a61f18ebd4f /js/panels/presets/style-presets.reel | |
parent | 2a5374af0b06e0402498b61985fd3c67d063729b (diff) | |
parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
download | ninja-c394a1cf04bbf3b9ad3003ec86498a30d00926bb.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/presets/style-presets.reel')
-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 | }); |