diff options
| author | Pushkar Joshi | 2012-03-06 17:05:05 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-06 17:05:05 -0800 |
| commit | 794abd077a0cd4c797d3f566281deca77b184bfe (patch) | |
| tree | 3bf4a83ca714def2671fe8cef93db859b0d5553f /js/panels/Components | |
| parent | c155cd238b6f9e0b8191e0fc533f7bc974b762c2 (diff) | |
| parent | 2e3943a8f751ec572066f168b58464c24b9f29e5 (diff) | |
| download | ninja-794abd077a0cd4c797d3f566281deca77b184bfe.tar.gz | |
Merge branch 'master' into pentool
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 | } |