diff options
| author | Jonathan Duran | 2012-03-23 07:24:39 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-23 07:24:39 -0700 |
| commit | 846d539997bf188b9caf63cdf0008367fe6c9ede (patch) | |
| tree | ae0ed9293cd5859cd10694fb2e045b2101ed8df8 /js/panels/Components | |
| parent | 595a569cf459e7e7cbe19e546c23322b56e44341 (diff) | |
| parent | 57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff) | |
| download | ninja-846d539997bf188b9caf63cdf0008367fe6c9ede.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 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 | } |