From 2805065a1f61241f25e1cf0d336dbb77d7e1dc01 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Fri, 20 Jul 2012 14:23:03 -0700 Subject: The zoom slider resets.Commented some code Signed-off-by: Kruti Shah --- .../Timeline/TimelinePanel.reel/TimelinePanel.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'js/panels/Timeline') 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, { this.currentLayersSelected = this.application.ninja.currentDocument.tlCurrentLayersSelected; this.currentElementsSelected = this.application.ninja.currentDocument.tlCurrentElementsSelected; this._currentDocumentUuid = this.application.ninja.currentDocument.uuid; - this.millisecondsOffset = this.application.ninja.currentDocument.tlZoomSliderValue ; - this.zoom_slider.value = this.application.ninja.currentDocument.tlZoomSliderValue; - +// if(this.application.ninja.currentDocument.tlZoomSliderValue){ +// this.millisecondsOffset = this.application.ninja.currentDocument.tlZoomSliderValue ; +// if(this.zoom_slider){ +// this.zoom_slider.value = this.application.ninja.currentDocument.tlZoomSliderValue; +// } +// +// } // Are we only showing animated layers? if (this.application.ninja.currentDocument.boolShowOnlyAnimated) { // Fake a click. @@ -1707,7 +1711,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { zoomTrackContainerWidthChange:{ value:function () { - if(this.application.ninja.currentDocument){ + if(this.application.ninja.currentDocument && this.zoomValue){ this.application.ninja.currentDocument.tlZoomSliderValue = this.zoomValue; } @@ -1923,7 +1927,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { handleElementsRemoved:{ value:function (event) { - this.deleteLayers(event.detail); + + if(typeof(event.detail.length) === "undefined"){ + this.deleteLayers([event.detail]); + }else{ + this.deleteLayers(event.detail); + } } }, -- cgit v1.2.3