Merge branch 'refs/heads/Timeline' into Timeline_updated

3 files changed, 6 insertions, 2 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 35f348c7..9ed69f4a 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -34,7 +34,8 @@
                         "element": {"#": "layer_resizer"},
                         "panel" : {"#" : "timeline_leftpane"},
                         "isVertical" : false,
-                        "isInversed" : false
+                        "isInversed" : false,
+                        "isPanel"    : false
                     }
                 },
 
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 31bdd217..ef353490 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -192,6 +192,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     handleDeleteLayerClick:{
         value:function(event){
             event.stopPropagation();
+            this._deleteKeyDown=false;
             if(this.application.ninja.currentSelectedContainer.id==="UserContent"){
                 this._hashKey="123";
             }
@@ -574,7 +575,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     drawTimeMarkers:{
         value:function(){
             var i;
-            var totalMarkers = Math.floor(this.track_container.offsetWidth / 80);
+            var totalMarkers = Math.floor(this.time_markers.offsetWidth / 80);
             for(i=0;i<totalMarkers;i++){
                 var timeMark = document.createElement("div");
                 var markValue = this.calculateTimeMarkerValue(i);
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index 0a73705a..cbae49c8 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -27,6 +27,7 @@
 }
 .tl_leftpane{
     min-width: 200px;
+    max-width: 500px;
     position: relative;
     overflow: hidden;
     -webkit-box-flex: 0;
@@ -142,6 +143,7 @@
         left: 0px;
         height: 20px;
         width: 100%;
+    border-bottom-style: solid;
 }
 
 .masterlayer{