3 files changed, 15 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 0d769c23..8a4073c9 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 521c315d..e037cccb 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -527,7 +527,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
        set:function (newVal) {
            if (newVal !== this._millisecondsOffset) {
-                this.tempValue  = newVal;
+                this.zoomValue  = newVal;
                var tempValue = (1/newVal) * 1000000;
                newVal = tempValue;
@@ -1130,7 +1130,8 @@ 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;
                // Are we only showing animated layers?
                                if (this.application.ninja.currentDocument.boolShowOnlyAnimated) {
@@ -1706,12 +1707,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
    zoomTrackContainerWidthChange:{
        value:function () {
-            this.tempValue = this.tempValue/1000;
+            if(this.application.ninja.currentDocument){
-            this.tempValue *= 30;
+                this.application.ninja.currentDocument.tlZoomSliderValue = this.zoomValue;
+            }
+            this.zoomValue = this.zoomValue/1000;
+            this.zoomValue *= 30;
-            this.container_tracks.style.width = (this.tempValue * 80) + "px";
+            this.container_tracks.style.width = (this.zoomValue * 80) + "px";
-            this.master_track.style.width = (this.tempValue * 80) + "px";
+            this.master_track.style.width = (this.zoomValue * 80) + "px";
-            this.time_markers.style.width = (this.tempValue * 80) + "px";
+            this.time_markers.style.width = (this.zoomValue * 80) + "px";
            if (this.timeMarkerHolder) {
                this.time_markers.removeChild(this.timeMarkerHolder);
            }
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index cf6df347..cce01c90 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -305,7 +305,7 @@ POSSIBILITY OF SUCH DAMAGE.
    top: 0;
    left: 0;
    position: absolute;
-    z-index: 91;
+    z-index: 1;
    opacity: 0.7;
 }
 .timebar{

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 0d769c23..8a4073c9 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility LLC.	3	Copyright (c) 2012, Motorola Mobility LLC.
4	All Rights Reserved.	4	All Rights Reserved.


diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 521c315d..e037cccb 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -527,7 +527,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
527	set:function (newVal) {	527	set:function (newVal) {
528	if (newVal !== this._millisecondsOffset) {	528	if (newVal !== this._millisecondsOffset) {
529		529
530	this.tempValue = newVal;	530	this.zoomValue = newVal;
531	var tempValue = (1/newVal) * 1000000;	531	var tempValue = (1/newVal) * 1000000;
532	newVal = tempValue;	532	newVal = tempValue;
533		533
@@ -1130,7 +1130,8 @@ 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		1133	this.millisecondsOffset = this.application.ninja.currentDocument.tlZoomSliderValue ;
		1134	this.zoom_slider.value = this.application.ninja.currentDocument.tlZoomSliderValue;
1134		1135
1135	// Are we only showing animated layers?	1136	// Are we only showing animated layers?
1136	if (this.application.ninja.currentDocument.boolShowOnlyAnimated) {	1137	if (this.application.ninja.currentDocument.boolShowOnlyAnimated) {
@@ -1706,12 +1707,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1706	zoomTrackContainerWidthChange:{	1707	zoomTrackContainerWidthChange:{
1707	value:function () {	1708	value:function () {
1708		1709
1709	this.tempValue = this.tempValue/1000;	1710	if(this.application.ninja.currentDocument){
1710	this.tempValue *= 30;	1711	this.application.ninja.currentDocument.tlZoomSliderValue = this.zoomValue;
		1712
		1713	}
		1714
		1715	this.zoomValue = this.zoomValue/1000;
		1716	this.zoomValue *= 30;
1711		1717
1712	this.container_tracks.style.width = (this.tempValue * 80) + "px";	1718	this.container_tracks.style.width = (this.zoomValue * 80) + "px";
1713	this.master_track.style.width = (this.tempValue * 80) + "px";	1719	this.master_track.style.width = (this.zoomValue * 80) + "px";
1714	this.time_markers.style.width = (this.tempValue * 80) + "px";	1720	this.time_markers.style.width = (this.zoomValue * 80) + "px";
1715	if (this.timeMarkerHolder) {	1721	if (this.timeMarkerHolder) {
1716	this.time_markers.removeChild(this.timeMarkerHolder);	1722	this.time_markers.removeChild(this.timeMarkerHolder);
1717	}	1723	}


diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss index cf6df347..cce01c90 100644 --- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss +++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -305,7 +305,7 @@ POSSIBILITY OF SUCH DAMAGE.
305	top: 0;	305	top: 0;
306	left: 0;	306	left: 0;
307	position: absolute;	307	position: absolute;
308	z-index: 91;	308	z-index: 1;
309	opacity: 0.7;	309	opacity: 0.7;
310	}	310	}
311	.timebar{	311	.timebar{