aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJon Reid2012-06-28 09:51:33 -0700
committerJon Reid2012-06-28 09:51:33 -0700
commit8780f4be63bac964d23939127298f6334f482cdf (patch)
tree197ffef1e31f60f3dc8ddb23a36f263f65c32a9f /js/panels/Timeline
parentb50b720e7b34cea86e9aabfb27e843376508b00e (diff)
parent7e098b5a710776439ca6ad00604e2f2011dbc4ed (diff)
downloadninja-8780f4be63bac964d23939127298f6334f482cdf.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section.
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 87cf1e4f..3d31a50b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1233,6 +1233,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1233 } 1233 }
1234 } 1234 }
1235 1235
1236 if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
1237 matchedValues+=1;
1238 }
1239 }
1240 }
1236 1241
1237 1242
1238 // TODO: this should probably check to see if it actually needs to run. 1243 // TODO: this should probably check to see if it actually needs to run.
@@ -1792,6 +1797,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1792 currentLayersSelectedLength = this.currentLayersSelected.length, 1797 currentLayersSelectedLength = this.currentLayersSelected.length,
1793 arrLayersLength = this.arrLayers.length, 1798 arrLayersLength = this.arrLayers.length,
1794 returnVal = arrLayersLength -1; 1799 returnVal = arrLayersLength -1;
1800 if (returnVal === -1) {
1801 return false;
1802 }
1795 if (this.currentLayersSelected === false) { 1803 if (this.currentLayersSelected === false) {
1796 return false; 1804 return false;
1797 } 1805 }