diff options
author | Eric Guzman | 2012-06-28 11:02:16 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-28 11:02:16 -0700 |
commit | f89895e5fb94a192d25f26249dadcb8ab225c72b (patch) | |
tree | 8ce918bb2605c67c4fc093e96543de8e10882f1d /js/panels/components-panel.reel | |
parent | e1f83a2c603bf9ddb74889f7ba5b697bb474edaa (diff) | |
parent | 56d6311f398e04eee3883a5c848fec3b2b53c981 (diff) | |
download | ninja-f89895e5fb94a192d25f26249dadcb8ab225c72b.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO
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 | ||