aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
diff options
context:
space:
mode:
authorKruti Shah2012-06-28 09:24:03 -0700
committerKruti Shah2012-06-28 09:24:03 -0700
commit8aef94d26e172785463161899dfcc877b4233bdb (patch)
treea9d5ff91681aa06bf26cb62994461a58d3f80005 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
parentdeefd070e5e6e793eef2c3d937e7b1a97b0f6830 (diff)
parent299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff)
downloadninja-8aef94d26e172785463161899dfcc877b4233bdb.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js3
1 files changed, 3 insertions, 0 deletions
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, {
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 }