aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJonathan Duran2012-07-19 08:41:49 -0700
committerJonathan Duran2012-07-19 08:41:49 -0700
commit142dc59794769ad783ab050b27b4f56ac5773afb (patch)
treec6b478666eab9e637039467d70e948e1e0e46882 /js/panels
parent16d06bac95ce8334f8c5586750e98360dbc9cbd9 (diff)
parent0b899ad6cec5e4626dfa32230be7c04d22d4f820 (diff)
downloadninja-142dc59794769ad783ab050b27b4f56ac5773afb.tar.gz
Merge branch 'refs/heads/Timeline-local-kruti' into TimelineUber
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html3
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js20
2 files changed, 15 insertions, 8 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index c287e68e..593b4ea1 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -63,7 +63,8 @@ POSSIBILITY OF SUCH DAMAGE.
63 "tl_configbutton" : {"#" : "tl-configbutton"}, 63 "tl_configbutton" : {"#" : "tl-configbutton"},
64 "checkable_lock" : {"#" : "checkable_lock"}, 64 "checkable_lock" : {"#" : "checkable_lock"},
65 "checkable_visible":{"#" : "checkable_visible"}, 65 "checkable_visible":{"#" : "checkable_visible"},
66 "play_button" : {"#" : "play_button"} 66 "play_button" : {"#" : "play_button"},
67 "zoom_slider" : {"@" : "timelineZoomSlider"}
67 } 68 }
68 }, 69 },
69 70
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 4e9771d4..69fe254b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -512,7 +512,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
512 set:function (newVal) { 512 set:function (newVal) {
513 if (newVal !== this._millisecondsOffset) { 513 if (newVal !== this._millisecondsOffset) {
514 514
515 this.tempValue = newVal; 515 this.zoomValue = newVal;
516 var tempValue = (1/newVal) * 1000000; 516 var tempValue = (1/newVal) * 1000000;
517 newVal = tempValue; 517 newVal = tempValue;
518 518
@@ -1116,7 +1116,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1116 this.currentLayersSelected = this.application.ninja.currentDocument.tlCurrentLayersSelected; 1116 this.currentLayersSelected = this.application.ninja.currentDocument.tlCurrentLayersSelected;
1117 this.currentElementsSelected = this.application.ninja.currentDocument.tlCurrentElementsSelected; 1117 this.currentElementsSelected = this.application.ninja.currentDocument.tlCurrentElementsSelected;
1118 this._currentDocumentUuid = this.application.ninja.currentDocument.uuid; 1118 this._currentDocumentUuid = this.application.ninja.currentDocument.uuid;
1119 1119 this.millisecondsOffset = this.application.ninja.currentDocument.tlZoomSliderValue ;
1120 this.zoom_slider.value = this.application.ninja.currentDocument.tlZoomSliderValue;
1120 1121
1121 // Are we only showing animated layers? 1122 // Are we only showing animated layers?
1122 if (this.application.ninja.currentDocument.boolShowOnlyAnimated) { 1123 if (this.application.ninja.currentDocument.boolShowOnlyAnimated) {
@@ -1707,12 +1708,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1707 zoomTrackContainerWidthChange:{ 1708 zoomTrackContainerWidthChange:{
1708 value:function () { 1709 value:function () {
1709 1710
1710 this.tempValue = this.tempValue/1000; 1711 if(this.application.ninja.currentDocument){
1711 this.tempValue *= 30; 1712 this.application.ninja.currentDocument.tlZoomSliderValue = this.zoomValue;
1713
1714 }
1715
1716 this.zoomValue = this.zoomValue/1000;
1717 this.zoomValue *= 30;
1712 1718
1713 this.container_tracks.style.width = (this.tempValue * 80) + "px"; 1719 this.container_tracks.style.width = (this.zoomValue * 80) + "px";
1714 this.master_track.style.width = (this.tempValue * 80) + "px"; 1720 this.master_track.style.width = (this.zoomValue * 80) + "px";
1715 this.time_markers.style.width = (this.tempValue * 80) + "px"; 1721 this.time_markers.style.width = (this.zoomValue * 80) + "px";
1716 if (this.timeMarkerHolder) { 1722 if (this.timeMarkerHolder) {
1717 this.time_markers.removeChild(this.timeMarkerHolder); 1723 this.time_markers.removeChild(this.timeMarkerHolder);
1718 } 1724 }