aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Components
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-06 16:19:59 -0800
committerJose Antonio Marquez2012-03-06 16:19:59 -0800
commitf6a60f50ca9cd09713baa27f2990eda9346496fc (patch)
tree3975b1aa412e5b8c377accfe15536622544d6826 /js/panels/Components
parent7271c25bf34917b1751f433d284f21485057425b (diff)
parent2e3943a8f751ec572066f168b58464c24b9f29e5 (diff)
downloadninja-f6a60f50ca9cd09713baa27f2990eda9346496fc.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Conflicts: js/controllers/selection-controller.js
Diffstat (limited to 'js/panels/Components')
-rwxr-xr-xjs/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js2
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 }