diff options
author | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
commit | ee1adbcc33932bc27966c02b159a3ab06966d4a5 (patch) | |
tree | a9d5ff91681aa06bf26cb62994461a58d3f80005 /js/panels/components-panel.reel | |
parent | ca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (diff) | |
parent | 299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff) | |
download | ninja-ee1adbcc33932bc27966c02b159a3ab06966d4a5.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
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 | ||