aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Components
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-06 16:18:10 -0800
committerValerio Virgillito2012-03-06 16:18:10 -0800
commit2e3943a8f751ec572066f168b58464c24b9f29e5 (patch)
tree3975b1aa412e5b8c377accfe15536622544d6826 /js/panels/Components
parentc2805e03c84b6e598556fd06d1ede7aaeea7ce9c (diff)
parent4f498b43264327f5886e0370bd3536453d47570a (diff)
downloadninja-2e3943a8f751ec572066f168b58464c24b9f29e5.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
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 }