1 files changed, 148 insertions, 68 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 07fee19d..62ae625f 100755..100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -65,6 +65,22 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:1000
     },
 
+    _masterDuration:{
+        serializable: true,
+        value:0
+    },
+
+    masterDuration:{
+        serializable:true,
+        get:function(){
+            return this._masterDuration;
+        },
+        set:function(val){
+            this._masterDuration = val;
+            this.timebar.style.width = (this._masterDuration / 12) + "px";
+        }
+    },
+
     _arrTracks:{
         serializable:true,
         value:[]
@@ -109,6 +125,20 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+    _selectedTweens:{
+        value:[]
+    },
+
+    selectedTweens:{
+        serializable:true,
+        get:function () {
+            return this._selectedTweens;
+        },
+        set:function (newVal) {
+            this._selectedTweens = newVal;
+        }
+    },
+
     _isLayer:{
         value:false
     },
@@ -118,21 +148,29 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         writable:true
     },
 
-    _arrLayersNonEmpty:{
-        value:true,
+    _captureSelection:{
+        value:false,
         writable:true
     },
 
-    _captureSelection:{
+    _openDoc:{
         value:false,
         writable:true
     },
+    timeMarkerHolder:{
+        value: null
+    },
     /* === END: Models === */
 
     /* === BEGIN: Draw cycle === */
     prepareForDraw:{
-        value:function () {
+            value:function () {
+                this.eventManager.addEventListener( "onOpenDocument", this, false);
+            }
+        },
 
+    handleOnOpenDocument:{
+        value:function(){
             this.eventManager.addEventListener("deleteLayerClick", this, false);
             this.eventManager.addEventListener("newLayer", this, false);
             this.eventManager.addEventListener("deleteLayer", this, false);
@@ -146,9 +184,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.hashLayerNumber = this.createLayerNumberHash();
             this.hashElementMapToLayer = this.createElementMapToLayer();
             this.initTimelineView();
+
+
         }
     },
-
     willDraw:{
         value:function () {
             if (this._isLayer) {
@@ -162,6 +201,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     /* === BEGIN: Controllers === */
     initTimelineView:{
         value:function () {
+            var myIndex;
             this.layout_tracks = this.element.querySelector(".layout-tracks");
             this.layout_markers = this.element.querySelector(".layout_markers");
 
@@ -172,14 +212,38 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.timeline_leftpane.addEventListener("click", this.timelineLeftPaneClick.bind(this), false);
             this.layout_tracks.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
             this.user_layers.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
+            this.end_hottext.addEventListener("changing", this.updateTrackContainerWidth.bind(this), false);
 
             this.drawTimeMarkers();
 
             this._hashKey = "123";
             _firstLayerDraw = false;
-            NJevent('newLayer', this._hashKey);
+            if(this.application.ninja.currentDocument.documentRoot.children[0]){
+                myIndex=0;
+                while(this.application.ninja.currentDocument.documentRoot.children[myIndex])
+                {
+                    this._openDoc=true;
+                    NJevent('newLayer',{key:this._hashKey,ele:this.application.ninja.currentDocument.documentRoot.children[myIndex]})
+//                    this.selectLayer(myIndex);
+//                    TimelineTrack.retrieveStoredTweens();
+                    myIndex++;
+                }
+            }else{
+                NJevent('newLayer', this._hashKey);
+                this.selectLayer(0);
+
+            }
             _firstLayerDraw = true;
-            this.selectLayer(0);
+        }
+    },
+
+    updateTrackContainerWidth:{
+        value: function(){
+            this.container_tracks.style.width = (this.end_hottext.value * 80) + "px";
+            this.master_track.style.width = (this.end_hottext.value * 80) + "px";
+            this.time_markers.style.width = (this.end_hottext.value * 80) + "px";
+            this.time_markers.removeChild(this.timeMarkerHolder);
+            this.drawTimeMarkers();
         }
     },
 
@@ -197,7 +261,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 key = this.application.ninja.selectedElements[0].uuid;
                 switchSelectedLayer = this.hashElementMapToLayer.getItem(key);
                 if(switchSelectedLayer!==undefined){
-                    layerIndex = this.getLayerIndexByID(switchSelectedLayer.layerID)
+                    layerIndex = this.getLayerIndexByID(switchSelectedLayer.layerID);
                     this._captureSelection=false;
                     this.selectLayer(layerIndex);
                     this._captureSelection=true;
@@ -234,13 +298,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    deselectKeyframes:{
+    deselectTweens:{
         value:function () {
-            for (var i = 0; i < this.selectedKeyframes.length; i++) {
-                this.selectedKeyframes[i].deselect();
+            for (var i = 0; i < this.selectedTweens.length; i++) {
+                this.selectedTweens[i].deselectTween();
             }
-            this.selectedKeyframes = null;
-            this.selectedKeyframes = new Array();
+            this.selectedTweens = null;
+            this.selectedTweens = new Array();
         }
     },
 
@@ -253,6 +317,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     handleDeleteLayerClick:{
         value:function (event) {
+            if (this.arrLayers.length === 1) {
+                // do not delete last layer
+                return;
+            }
+            if (this.layerRepetition.selectedIndexes === null) {
+                // nothing is selected, do not delete
+                return;
+            }
             this._deleteKeyDown = false;
             if (this.application.ninja.currentSelectedContainer.id === "UserContent") {