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 From 1e0b05465c120a2b17d0f8420787a1d002e4b28e Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Wed, 27 Jun 2012 21:06:25 -0700 Subject: Timeline: bug fix IKNINJA-1843 --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 50171260..ef13f22e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -1773,6 +1773,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { currentLayersSelectedLength = this.currentLayersSelected.length, arrLayersLength = this.arrLayers.length, returnVal = arrLayersLength -1; + if (returnVal === -1) { + return false; + } if (this.currentLayersSelected === false) { return false; } -- cgit v1.2.3 From 7e098b5a710776439ca6ad00604e2f2011dbc4ed Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 28 Jun 2012 09:46:23 -0700 Subject: FIX layer selection bug Signed-off-by: Jonathan Duran --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index ef13f22e..45353a08 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -1220,7 +1220,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { for(i=0;i