diff options
| author | Nivesh Rajbhandari | 2012-03-12 16:25:28 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-12 16:25:28 -0700 |
| commit | 5fb358d9e80a364d5f300d60b7a9fe0f773741e7 (patch) | |
| tree | 2c4d5292b19c91697dffb542f369ec9dcb340f77 /js/panels/Components | |
| parent | 5f9b67be3b8bdb391d021103c6bcee6be2f6cdf4 (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-5fb358d9e80a364d5f300d60b7a9fe0f773741e7.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
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 | } |