3 files changed, 598 insertions, 627 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 14c5f1c8..9eb126e0 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -19,11 +19,9 @@
                         "element": {"#": "timeline_panel"},
                         "user_layers": {"#": "user_layers"},
                         "track_container": {"#": "right_inside"},
-                        "timeline_leftpane" : {"#" : "timeline_leftpane"},
+                        "timeline_leftpane" : {"#" : "leftpane_inside"},
                         "layer_tracks": {"#": "layer_tracks"},
                         "master_track": {"#": "master_track"},
-                        "newlayer_button": {"#": "newlayer_button"},
-                        "deletelayer_button": {"#": "deletelayer_button"},
                         "time_markers" : {"#": "timeline_markers"},
                         "layerRepetition" : {"@": "repetition1"},
                         "trackRepetition" : {"@" : "repetition2"},
@@ -77,7 +75,12 @@
                                 "boundObject" : {"@" : "repetition1"},
                                 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData",
                                 "oneway" : false
-                        }
+                        },
+                        "bindingPoint" : {
+                            "boundObject" : {"@" : "repetition1"},
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding",
+                            "oneway" : false
+                        }
                         }
                     },
                     
@@ -107,9 +110,33 @@
                             "boundObject" : {"@" : "repetition2"},
                             "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData",
                             "oneway" : false
+                        },
+                        "bindingPoint" : {
+                            "boundObject" : {"@" : "repetition2"},
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData.triggerBinding",
+                            "oneway" : false
                         }
+                        
                         }
                     },
+
+                "timelineZoomSlider":{
+                    "module":"js/components/slider.reel",
+                    "name":"Slider",
+                    "properties":{
+                        "element":{"#":"tl_slider"},
+                        "maxValue" : 10000,
+                        "minValue" : 1000
+                    },
+                    "bindings": {
+                        "value": {
+                            "boundObject": {"@": "owner"},
+                            "boundObjectPropertyPath": "millisecondsOffset",
+                            "oneway": false
+                        }
+                    }
+                },
+
                 "endHottext" : {
                     "module": "js/components/hottextunit.reel",
                     "name": "HotTextUnit",
@@ -153,14 +180,13 @@
                             <div id="master_layer" class="masterlayer">
                                 <div>Master Layer</div>
                             </div>
-                            <div id="container-layers">
+                            <div id="container-layers" style="position: relative;" class="container-layers">
                                 <div id="container-layer"></div>
                             </div>
                         </div>
 
                         <div id="timeline_gutter" class="timelinegutter">
-                            <div id="newlayer_button" class="newlayerbutton"></div>
-                            <div id="deletelayer_button" class="deletelayerbutton"></div>
+                            <div id="tl_slider" class="tl_slider"></div>
                             <input id="end_hottext" class="endhottext">
                         </div>
                     </div>
@@ -197,4 +223,4 @@
         </div>
 
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 033d0f79..10097805 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -19,12 +19,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     /* === BEGIN: Models === */
     _arrLayers:{
-        serializable: true,
+        serializable:true,
         value:[]
     },
 
     arrLayers:{
-        serializable: true,
+        serializable:true,
         get:function () {
             return this._arrLayers;
         },
@@ -50,12 +50,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
 
     _layerRepetition:{
-        serializable: true,
+        serializable:true,
         value:null
     },
 
     layerRepetition:{
-        serializable: true,
+        serializable:true,
         get:function () {
             return this._layerRepetition;
         },
@@ -64,18 +64,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    _cacheArrays : {
-        value: function() {
+    _cacheArrays:{
+        value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
-
+                this.application.ninja.currentDocument.tlCurrentSelectedContainer=this.application.ninja.currentSelectedContainer;
             }
         }
     },
-    
+
     // Set to false to skip array caching array sets in current document
-    _boolCacheArrays : {
-        value: true
+    _boolCacheArrays:{
+        value:true
     },
 
     _currentLayerNumber:{
@@ -95,87 +95,86 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _setCurrentLayerNumber:{
-        value:function(){
+        value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
             }
         }
     },
 
-    _hashKey:{
-            value:0
+    _currentLayerSelected:{
+        value:null
+    },
+    currentLayerSelected:{
+        get:function () {
+            return this._currentLayerSelected;
         },
+        set:function (newVal) {
+            this._currentLayerSelected = newVal;
+            this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal;
+        }
+    },
 
-    hashKey:{
+    _selectedLayerID:{
+        value:false
+    },
+    selectedLayerID:{