aboutsummaryrefslogtreecommitdiff
path: root/js/panels/components-panel.reel/components-panel.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-27 16:26:53 -0700
committerJose Antonio Marquez2012-06-27 16:26:53 -0700
commit82abdd67e024d668dfb0a7b72ad81e28367b9fd5 (patch)
tree09dc5bdd1d132c2871ff8ec216dc050f93ac516f /js/panels/components-panel.reel/components-panel.js
parent4f0104b0120219cbba2e0ac02c7b6aea437dd212 (diff)
parentec438dd0b501296f9aca8fdab7be99e518d7a8fd (diff)
downloadninja-82abdd67e024d668dfb0a7b72ad81e28367b9fd5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
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