3 files changed, 26 insertions, 11 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..7581d15a 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,8 +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;
+//                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.
@@ -1706,12 +1711,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
    zoomTrackContainerWidthChange:{
        value:function () {
-            this.tempValue = this.tempValue/1000;
+            if(this.application.ninja.currentDocument && this.zoomValue){
-            this.tempValue *= 30;
+                this.application.ninja.currentDocument.tlZoomSliderValue = this.zoomValue;
+            }
-            this.container_tracks.style.width = (this.tempValue * 80) + "px";
+            this.zoomValue = this.zoomValue/1000;
-            this.master_track.style.width = (this.tempValue * 80) + "px";
+            this.zoomValue *= 30;
-            this.time_markers.style.width = (this.tempValue * 80) + "px";
+            this.container_tracks.style.width = (this.zoomValue * 80) + "px";
+            this.master_track.style.width = (this.zoomValue * 80) + "px";
+            this.time_markers.style.width = (this.zoomValue * 80) + "px";
            if (this.timeMarkerHolder) {
                this.time_markers.removeChild(this.timeMarkerHolder);
            }
@@ -1917,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);
+            }
        }
    },
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..7581d15a 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,8 +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		1133	// if(this.application.ninja.currentDocument.tlZoomSliderValue){
1134		1134	// this.millisecondsOffset = this.application.ninja.currentDocument.tlZoomSliderValue ;
		1135	// if(this.zoom_slider){
		1136	// this.zoom_slider.value = this.application.ninja.currentDocument.tlZoomSliderValue;
		1137	// }
		1138	//
		1139	// }
1135	// Are we only showing animated layers?	1140	// Are we only showing animated layers?
1136	if (this.application.ninja.currentDocument.boolShowOnlyAnimated) {	1141	if (this.application.ninja.currentDocument.boolShowOnlyAnimated) {
1137	// Fake a click.	1142	// Fake a click.
@@ -1706,12 +1711,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1706	zoomTrackContainerWidthChange:{	1711	zoomTrackContainerWidthChange:{
1707	value:function () {	1712	value:function () {
1708		1713
1709	this.tempValue = this.tempValue/1000;	1714	if(this.application.ninja.currentDocument && this.zoomValue){
1710	this.tempValue *= 30;	1715	this.application.ninja.currentDocument.tlZoomSliderValue = this.zoomValue;
		1716
		1717	}
1711		1718
1712	this.container_tracks.style.width = (this.tempValue * 80) + "px";	1719	this.zoomValue = this.zoomValue/1000;
1713	this.master_track.style.width = (this.tempValue * 80) + "px";	1720	this.zoomValue *= 30;
1714	this.time_markers.style.width = (this.tempValue * 80) + "px";	1721
		1722	this.container_tracks.style.width = (this.zoomValue * 80) + "px";
		1723	this.master_track.style.width = (this.zoomValue * 80) + "px";
		1724	this.time_markers.style.width = (this.zoomValue * 80) + "px";
1715	if (this.timeMarkerHolder) {	1725	if (this.timeMarkerHolder) {
1716	this.time_markers.removeChild(this.timeMarkerHolder);	1726	this.time_markers.removeChild(this.timeMarkerHolder);
1717	}	1727	}
@@ -1917,7 +1927,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1917		1927
1918	handleElementsRemoved:{	1928	handleElementsRemoved:{
1919	value:function (event) {	1929	value:function (event) {
1920	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	}
1921	}	1936	}
1922	},	1937	},
1923		1938


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{