aboutsummaryrefslogtreecommitdiff
path: root/js/panels/components-panel.reel/components-panel.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-28 13:47:40 -0700
committerArmen Kesablyan2012-06-28 13:47:40 -0700
commitb194664df7e01aaeb8d1e7220a6de0e7f879f1db (patch)
tree833b024473be6ae1d57bdefc434583c49816f79f /js/panels/components-panel.reel/components-panel.js
parent53b8d67197a63e8c8efce102769dd8947a0eae4b (diff)
parent56d6311f398e04eee3883a5c848fec3b2b53c981 (diff)
downloadninja-b194664df7e01aaeb8d1e7220a6de0e7f879f1db.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/components-panel.reel/components-panel.js')
-rwxr-xr-xjs/panels/components-panel.reel/components-panel.js3
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