diff options
| author | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-07-02 09:23:13 -0700 |
| commit | 2bae1b3148233288ec0bc50876935bdfea1f288c (patch) | |
| tree | 686fa3b5b9615941bb7013f35c91e8f326b049db /js/panels/components-panel.reel | |
| parent | 2da05a4c71bfe9b136384d9e94fbfbef19f24550 (diff) | |
| parent | 12de4e49a309e210c13eb40b2ffa158ef2eb54a7 (diff) | |
| download | ninja-2bae1b3148233288ec0bc50876935bdfea1f288c.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into MaterialsUI
Diffstat (limited to 'js/panels/components-panel.reel')
| -rwxr-xr-x | js/panels/components-panel.reel/components-panel.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index ab033433..073a4438 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js | |||
| @@ -300,8 +300,11 @@ exports.ComponentsPanel = Montage.create(Component, { | |||
| 300 | 300 | ||
| 301 | componentInstanceOnFirstDraw: { | 301 | componentInstanceOnFirstDraw: { |
| 302 | value: function(instance) { | 302 | value: function(instance) { |
| 303 | var addDelegate = this.application.ninja.elementMediator.addDelegate; | ||
| 304 | this.application.ninja.elementMediator.addDelegate = null; | ||
| 303 | this.application.ninja.elementMediator.addElements(instance.element); | 305 | this.application.ninja.elementMediator.addElements(instance.element); |
| 304 | this.application.ninja.currentDocument.model.mObjects.push(instance); | 306 | this.application.ninja.currentDocument.model.mObjects.push(instance); |
| 307 | this.application.ninja.elementMediator.addDelegate = addDelegate; | ||
| 305 | } | 308 | } |
| 306 | }, | 309 | }, |
| 307 | 310 | ||