diff options
author | Armen Kesablyan | 2012-06-28 13:21:29 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-28 13:43:35 -0700 |
commit | 0aea7c15ebee0b0e9d51c2ca4b7eeec598227af1 (patch) | |
tree | f5d931c404c8066b971ed5a66f95f86776eacf8b /js/panels/components-panel.reel | |
parent | 9add37d85a9d90541daae8ad5316388c4d9a9da4 (diff) | |
parent | f89895e5fb94a192d25f26249dadcb8ab225c72b (diff) | |
download | ninja-0aea7c15ebee0b0e9d51c2ca4b7eeec598227af1.tar.gz |
Merge branch 'Bindables_GIO' of https://github.com/ericguzman/ninja-internal into GIO_binding-view
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 | ||