diff options
author | Jose Antonio Marquez | 2012-03-06 17:02:44 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-06 17:02:44 -0800 |
commit | fca92904597895675ddd216399cd235f3c5a7cfa (patch) | |
tree | 77c30a958c0283a6aa208b93640c6008eeb943e2 /js/panels/Components/ComponentsPanelBase.reel | |
parent | ec7cbc95de031d2be667c2a8629a9d63e91f7e1a (diff) | |
parent | eebb7de4d19cddec9c763a073d8cf41d76fe70f7 (diff) | |
download | ninja-fca92904597895675ddd216399cd235f3c5a7cfa.tar.gz |
Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate
Diffstat (limited to 'js/panels/Components/ComponentsPanelBase.reel')
-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 | } |