aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Components
diff options
context:
space:
mode:
authorArmen Kesablyan2012-03-19 11:01:00 -0700
committerArmen Kesablyan2012-03-19 11:01:00 -0700
commit60107392554fa993a16e748f7281be423055cd19 (patch)
tree408b7b9422265d29df2c37eb6a120c09812abf2c /js/panels/Components
parent725bb869618b9e0ebb2820a24bca5d1cf53a4810 (diff)
parent954f5a13e371febcb1c0fb8015c577ee51c23130 (diff)
downloadninja-60107392554fa993a16e748f7281be423055cd19.tar.gz
Merge branch 'refs/heads/master' into DataBinding
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 b6bee37d..b4eec771 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 }