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/panels/Timeline/TimelinePanel.reel')
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 <jduran@motorola.com>
---
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/panels/Timeline/TimelinePanel.reel')
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<arrSelectedIndexesLength;i++){
for(j=0;j<currentLayersSelectedLength;j++){
- if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){
+ if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
matchedValues+=1;
}
}
--
cgit v1.2.3