diff options
| author | Jose Antonio Marquez | 2012-03-09 13:36:41 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-09 13:36:41 -0800 |
| commit | 9a03f869ff4520431da3ac8c64b748b5fbb60339 (patch) | |
| tree | dad948f012cbc7d65e0dccde273667a389ff1c6d /js/panels/Components | |
| parent | b0b4a1ee6792d98f06cbd8ecf5291e66db8a4eef (diff) | |
| parent | b4eb2f6cc1208fe5c18aa1f02a85adda25075d81 (diff) | |
| download | ninja-9a03f869ff4520431da3ac8c64b748b5fbb60339.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into Color
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 b4eec771..b6bee37d 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 | } |