From d8bb1bf1537166753a53000e31ece8f99c7daaaa Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 26 Jun 2012 17:39:46 -0700 Subject: including the map icons inside the component and adding the empty category Signed-off-by: Valerio Virgillito --- js/io/system/ninjalibrary.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json index 579264cb..c5ccbc82 100644 --- a/js/io/system/ninjalibrary.json +++ b/js/io/system/ninjalibrary.json @@ -1,6 +1,6 @@ { "libraries": [ - {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.0.0"}, + {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.1.0"}, {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.3"} ] } \ No newline at end of file -- cgit v1.2.3 From d13d20285df2fcdc9f235ee4246355e955c34619 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 27 Jun 2012 15:18:03 -0700 Subject: Temporarily disable ElementMediator's addDelegate when adding components. Signed-off-by: Nivesh Rajbhandari --- js/panels/components-panel.reel/components-panel.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js') 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, { componentInstanceOnFirstDraw: { value: function(instance) { + var addDelegate = this.application.ninja.elementMediator.addDelegate; + this.application.ninja.elementMediator.addDelegate = null; this.application.ninja.elementMediator.addElements(instance.element); this.application.ninja.currentDocument.model.mObjects.push(instance); + this.application.ninja.elementMediator.addDelegate = addDelegate; } }, -- cgit v1.2.3