diff options
| author | hwc487 | 2012-06-28 12:17:22 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-28 12:17:22 -0700 |
| commit | 230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (patch) | |
| tree | 133be243b24260f831252f347ed66f24e2b78136 /js/panels/components-panel.reel | |
| parent | 22cbc9644b79df60b3f6336f9563debd47fb3ea1 (diff) | |
| parent | 56d6311f398e04eee3883a5c848fec3b2b53c981 (diff) | |
| download | ninja-230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
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 | ||