aboutsummaryrefslogtreecommitdiff
path: root/js/panels/components-panel.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-27 15:54:34 -0700
committerValerio Virgillito2012-06-27 15:54:34 -0700
commitec438dd0b501296f9aca8fdab7be99e518d7a8fd (patch)
tree7ea4b9122a670b8ad8c7d556d09adf6dcddbf2b8 /js/panels/components-panel.reel
parentd764ea70f75841cbe959733b471509b5a61d8b9c (diff)
parentd13d20285df2fcdc9f235ee4246355e955c34619 (diff)
downloadninja-ec438dd0b501296f9aca8fdab7be99e518d7a8fd.tar.gz
Merge pull request #347 from mqg734/ComponentShapeToolBug
Temporarily disable ElementMediator's addDelegate when adding components.
Diffstat (limited to 'js/panels/components-panel.reel')
-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