2 files changed, 47 insertions, 11 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 19709ca7..8ddc81cd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -31,6 +31,7 @@
                         "container_tracks" : {"#" : "container-tracks"},
                         "end_hottext" : {"@" : "endHottext"},
                         "container_layers" : {"#" : "container-layers"},
+                        "container_tracks" : {"#" : "container-tracks"},
                         "timeline_disabler" : {"#" : "timeline-disabler"},
                         "checkable_relative" : {"#" : "checkable_relative"},
                         "checkable_absolute" : {"#" : "checkable_absolute"},
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index d1cab096..1ce627b7 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -177,7 +177,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         },
         set:function (val) {
             this._masterDuration = val;
-            this.timebar.style.width = (this._masterDuration / 12) + "px";
+            var intDur = Math.round(val/12),
+                        strWidth = intDur + "px";
+            this.timebar.style.width = strWidth;
         }
     },
 
@@ -329,6 +331,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     useAbsolutePosition:{
         value:true
     },
+    _currentDocumentUuid: {
+        value: false
+    },
+    _ignoreSelectionChanges: {
+        value: false
+    },
     /* === END: Models === */
     /* === BEGIN: Draw cycle === */
     prepareForDraw:{
@@ -344,6 +352,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.container_layers.addEventListener("dragstart", this.handleLayerDragStart.bind(this), false);
             this.container_layers.addEventListener("dragend", this.handleLayerDragEnd.bind(this), false);
             this.container_layers.addEventListener("dragover", this.handleLayerDragover.bind(this), false);
+            //this.container_tracks.addEventListener("dragover", this.handleKeyframeDragover.bind(this), false);
             this.container_layers.addEventListener("drop", this.handleLayerDrop.bind(this), false);
             
             // Bind the handlers for the config menu
@@ -584,6 +593,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.drawTimeMarkers();
             // Document switching
             // Check to see if we have saved timeline information in the currentDocument.
+            //console.log("TimelinePanel.initTimelineForDocument");
+
             if ((typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined")) {
                 //console.log('TimelinePanel.initTimelineForDocument: new Document');
                 // No, we have no information stored.
@@ -609,12 +620,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 // Draw the repetition.
                 this.arrLayers = this.temparrLayers;
                 this.currentLayerNumber = this.arrLayers.length;
+                this._currentDocumentUuid = this.application.ninja.currentDocument.uuid;
                 boolAlreadyInitialized = true;
                 
                         } else if (this.application.ninja.currentDocument.setLevel) {
                 //console.log('TimelinePanel.initTimelineForDocument: breadCrumbClick');
                                 // Information stored, but we're moving up or down in the breadcrumb.
                                 // Get the current selection and restore timeline info for its children.
+                                //debugger;
                 var parentNode = this.application.ninja.currentSelectedContainer,
                         storedCurrentLayerNumber = this.application.ninja.currentDocument.tllayerNumber;
                 this.temparrLayers = [];
@@ -650,6 +663,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber;
                 this.currentLayerSelected = this.application.ninja.currentDocument.tlCurrentLayerSelected;
                 this.currentLayersSelected = this.application.ninja.currentDocument.tlCurrentLayersSelected;
+                this._currentDocumentUuid = this.application.ninja.currentDocument.uuid;
 
 
                 //debugger;
@@ -699,23 +713,32 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this._openDoc = false;
             this.end_hottext.value = 25;
             this.updateTrackContainerWidth();
-            this.masterDuration = 0;
             // Clear the repetitions
             if (this.arrLayers.length > 0) {
                 this.arrLayers = [];
                 this.arrLayers.length = 0;
             }
+            this.resetMasterDuration();
         }
     },
 
     handleDocumentChange:{
         value:function () {
+                // console.log("TimelinePanel.handleDocumentChange");
+                
                         if (this.application.ninja.currentDocument == null) {
                                 // On app initialization, the binding is triggered before
                                 // there is a currentDocument.  We don't do anything at that time.
                                 return;
                         }
-            // this.application.ninja.currentDocument.setLevel = true;
+                        
+                        // Is this the same document?
+                        if (this._currentDocumentUuid === this.application.ninja.currentDocument.uuid) {
+                                // Yes, same document, so we are changing levels.
+                                this.application.ninja.currentDocument.setLevel = true;
+                                this._ignoreSelectionChanges = true;
+                        }
+                        
             this._boolCacheArrays = false;
             this.clearTimelinePanel();
             this._boolCacheArrays = true;
@@ -799,15 +822,20 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 arrLayersLength = this.arrLayers.length,
                 intNumSelected = this.application.ninja.selectedElements.length,
                 checkIndex = 0;
-                
-            this.deselectTweens();
-            //console.log("TimelinePanel.handleSelectionChange")
+            
+            //console.log("TimelinePanel.handleSelectionChange, intNumSelected is ", intNumSelected)
+            
             if (intNumSelected === 0) {
-                this.selectLayers([]);
+                if (this._ignoreSelectionChanges !== true) {
+                        this.selectLayers([]);
+                } else {
+                        this._ignoreSelectionChanges = false;
+                }
+                
                 this.currentLayerSelected = false;
                 this.currentLayersSelected = false;
             }
-            
+
             if (intNumSelected === 1) {
                 this.currentLayersSelected = false;
                 if (this.application.ninja.selectedElements[0]) {
@@ -858,7 +886,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             
             //console.log(arrSelectedIndexes);
             
-
+                        
             if (this.selectedKeyframes) {
                 this.deselectTweens();
             }
@@ -867,8 +895,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.arrLayers[i].layerData.isSelected = false;
                 this.triggerLayerBinding(i);
             }
-            
-            this.currentLayersSelected = false;
+
+            if (this.currentLayersSelected !== false) {
+                this.currentLayersSelected = false;
+            }
             if (arrSelectedIndexesLength > 0) {