diff options
| author | Eric Guzman | 2012-03-19 11:52:35 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-19 11:52:35 -0700 |
| commit | dde5b5054f93db493e5d4d502e677f5781334b08 (patch) | |
| tree | 4960525a5b183f0e966462c566817331bea0f3cd /js/panels/Components | |
| parent | f08e3660384ed6ed2ba8ecf959c90fd1ade818eb (diff) | |
| parent | 954f5a13e371febcb1c0fb8015c577ee51c23130 (diff) | |
| download | ninja-dde5b5054f93db493e5d4d502e677f5781334b08.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/panels/Components')
| -rwxr-xr-x | js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js index b6bee37d..b4eec771 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js +++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js | |||
| @@ -118,7 +118,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component | |||
| 118 | didCreate: { | 118 | didCreate: { |
| 119 | value: function() { | 119 | value: function() { |
| 120 | // Setup the drop delegate | 120 | // Setup the drop delegate |
| 121 | // this.application.ninja.dragDropMediator.dropDelegate = this; | 121 | this.application.ninja.dragDropMediator.dropDelegate = this; |
| 122 | // Loop through the component and load the JSON data for them | 122 | // Loop through the component and load the JSON data for them |
| 123 | this._loadComponents(); | 123 | this._loadComponents(); |
| 124 | } | 124 | } |