aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJonathan Duran2012-07-20 14:28:56 -0700
committerJonathan Duran2012-07-20 14:28:56 -0700
commit3487c690d526534f27578acdffe1a45f2526cbf6 (patch)
treec806f4dd113c9bd24fc69f7acc5787be5cce523a /js/panels/Timeline
parentc010ce7257df2545abb645318918c67e8e49251d (diff)
parent2805065a1f61241f25e1cf0d336dbb77d7e1dc01 (diff)
downloadninja-3487c690d526534f27578acdffe1a45f2526cbf6.tar.gz
Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js19
1 files changed, 14 insertions, 5 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index e037cccb..7581d15a 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1130,9 +1130,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1130 this.currentLayersSelected = this.application.ninja.currentDocument.tlCurrentLayersSelected; 1130 this.currentLayersSelected = this.application.ninja.currentDocument.tlCurrentLayersSelected;
1131 this.currentElementsSelected = this.application.ninja.currentDocument.tlCurrentElementsSelected; 1131 this.currentElementsSelected = this.application.ninja.currentDocument.tlCurrentElementsSelected;
1132 this._currentDocumentUuid = this.application.ninja.currentDocument.uuid; 1132 this._currentDocumentUuid = this.application.ninja.currentDocument.uuid;
1133 this.millisecondsOffset = this.application.ninja.currentDocument.tlZoomSliderValue ; 1133// if(this.application.ninja.currentDocument.tlZoomSliderValue){
1134 this.zoom_slider.value = this.application.ninja.currentDocument.tlZoomSliderValue; 1134// this.millisecondsOffset = this.application.ninja.currentDocument.tlZoomSliderValue ;
1135 1135// if(this.zoom_slider){
1136// this.zoom_slider.value = this.application.ninja.currentDocument.tlZoomSliderValue;
1137// }
1138//
1139// }
1136 // Are we only showing animated layers? 1140 // Are we only showing animated layers?
1137 if (this.application.ninja.currentDocument.boolShowOnlyAnimated) { 1141 if (this.application.ninja.currentDocument.boolShowOnlyAnimated) {
1138 // Fake a click. 1142 // Fake a click.
@@ -1707,7 +1711,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1707 zoomTrackContainerWidthChange:{ 1711 zoomTrackContainerWidthChange:{
1708 value:function () { 1712 value:function () {
1709 1713
1710 if(this.application.ninja.currentDocument){ 1714 if(this.application.ninja.currentDocument && this.zoomValue){
1711 this.application.ninja.currentDocument.tlZoomSliderValue = this.zoomValue; 1715 this.application.ninja.currentDocument.tlZoomSliderValue = this.zoomValue;
1712 1716
1713 } 1717 }
@@ -1923,7 +1927,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1923 1927
1924 handleElementsRemoved:{ 1928 handleElementsRemoved:{
1925 value:function (event) { 1929 value:function (event) {
1926 this.deleteLayers(event.detail); 1930
1931 if(typeof(event.detail.length) === "undefined"){
1932 this.deleteLayers([event.detail]);
1933 }else{
1934 this.deleteLayers(event.detail);
1935 }
1927 } 1936 }
1928 }, 1937 },
1929 1938