aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorEric Guzman2012-06-28 11:02:16 -0700
committerEric Guzman2012-06-28 11:02:16 -0700
commitf89895e5fb94a192d25f26249dadcb8ab225c72b (patch)
tree8ce918bb2605c67c4fc093e96543de8e10882f1d /js/panels/Timeline
parente1f83a2c603bf9ddb74889f7ba5b697bb474edaa (diff)
parent56d6311f398e04eee3883a5c848fec3b2b53c981 (diff)
downloadninja-f89895e5fb94a192d25f26249dadcb8ab225c72b.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 50171260..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, {
1220 for(i=0;i<arrSelectedIndexesLength;i++){ 1220 for(i=0;i<arrSelectedIndexesLength;i++){
1221 for(j=0;j<currentLayersSelectedLength;j++){ 1221 for(j=0;j<currentLayersSelectedLength;j++){
1222 1222
1223 if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){ 1223 if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
1224 matchedValues+=1; 1224 matchedValues+=1;
1225 } 1225 }
1226 } 1226 }
@@ -1773,6 +1773,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1773 currentLayersSelectedLength = this.currentLayersSelected.length, 1773 currentLayersSelectedLength = this.currentLayersSelected.length,
1774 arrLayersLength = this.arrLayers.length, 1774 arrLayersLength = this.arrLayers.length,
1775 returnVal = arrLayersLength -1; 1775 returnVal = arrLayersLength -1;
1776 if (returnVal === -1) {
1777 return false;
1778 }
1776 if (this.currentLayersSelected === false) { 1779 if (this.currentLayersSelected === false) {
1777 return false; 1780 return false;
1778 } 1781 }