diff options
author | Nivesh Rajbhandari | 2012-03-06 15:44:04 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-06 15:44:04 -0800 |
commit | b047a9414cc07f2cb20dbfd7240ca9b0bfdc231d (patch) | |
tree | ec1e9d373636569e09cdf669f063d4d2a1e441f4 /js/panels/Components | |
parent | 792793cd3991032b4840ade67f98ae8eae2d30a0 (diff) | |
parent | 4f498b43264327f5886e0370bd3536453d47570a (diff) | |
download | ninja-b047a9414cc07f2cb20dbfd7240ca9b0bfdc231d.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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 | } |