2 files changed, 17 insertions, 54 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index dc32d44d..3f3bf24a 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -100,26 +100,6 @@
                                                         "element":{"#": "position-track-base"}
                                                 }
                                         },
-                   "transformTracksRepetition": {
-                       "prototype": "montage/ui/repetition.reel",
-                           "properties": {
-                               "element": {"#": "content-transform-tracks"},
-                               "isSelectionEnabled" : false
-                           },
-                           "bindings": {
-                               "objects": {
-                                   "boundObject": {"@": "owner"},
-                                   "boundObjectPropertyPath": "arrTransformTracks",
-                                   "oneway": false
-                               }
-                           }
-                   },
-                                        "transformPropertyTrack" : {
-                                                "prototype" : "js/panels/Timeline/PropertyTrack.reel",
-                                                "properties" : {
-                                                        "element":{"#": "transform-track-base"}
-                                                }
-                                        },
                                         
                                         "mainCollapser" : {
                                                 "prototype" : "js/panels/timeline/Collapser",
@@ -171,31 +151,6 @@
                                                 }
                                         },
                                         
-                                        "transformCollapser" : {
-                                                "prototype" : "js/panels/timeline/Collapser",
-                                                "properties" : {
-                                                        "element" : {"#" : "content-transform-tracks"},
-                                                        "myContent" : {"#":"content-transform-tracks"},
-                                                        "contentHeight" : 40,
-                                                        "isLabelClickable" : false,
-                                                        "clicker" : {"#" : "label-transform"},
-                                                        "isCollapsed" : true,
-                                                        "isAnimated" : true     
-                                                },
-                                                "bindings" : {
-                                                        "isToggling" : {
-                                                                "boundObject" : {"@" : "owner" },
-                                                                "boundObjectPropertyPath" : "isTransformCollapsed",
-                                                                "oneway" : false
-                                                        },
-                                                        "bypassAnimation" : {
-                                                                "boundObject" : {"@": "owner"},
-                                                                "boundObjectPropertyPath" : "bypassAnimation",
-                                                                "oneway" : false
-                                                        }
-                                                }
-                                        },
-                                        
                                         "styleCollapser" : {
                                                 "prototype" : "js/panels/timeline/Collapser",
                                                 "properties" : {
@@ -239,12 +194,7 @@
                 <div class="content-position collapsible-content collapsible-collapsed" data-montage-id="content-position-tracks">
                         <div data-montage-id="position-track-base"></div>
                 </div>
-                <div class="label-transform collapsible-label collapsible-collapsed" data-montage-id="label-transform">
-                        
-                </div>
-                <div class="content-transform collapsible-content collapsible-collapsed" data-montage-id="content-transform-tracks">
-                        <div data-montage-id="transform-track-base"></div>
-                </div>
+
                 <div class="label-styles collapsible-label collapsible-collapsed" data-montage-id="label-styles">
                         
                 </div>
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index ddeb1449..891feada 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -771,6 +771,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             // delete the current rule
             this.ninjaStylesContoller.deleteRule(this.currentKeyframeRule);
 
+            // first combine all style track tween arrays with the main track tween array
+
             // build the new keyframe string
             var keyframeString = "@-webkit-keyframes " + this.animationName + " {";
 
@@ -796,9 +798,14 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     // Init and event handler for layer expand/collapse
     init:{
         value:function () {
-            
-            this.arrPositionTracks = [0, 1];
-            this.arrTransformTracks = [0, 1, 2, 3, 4];
+
+            // create track objects for position and transform tracks and push into arrays instead of dummy arrays
+
+            //this.createPositionTracks();
+            this.arrPositionTracks = [0, 1, 2, 3];
+
+            // get rid of transform tracks
+            //this.arrTransformTracks = [0, 1, 2, 3, 4];
 
             // Register event handler for layer events.
             defaultEventManager.addEventListener("layerEvent", this, false);
@@ -806,6 +813,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
 
+    createPositionTracks:{
+        value:function(){
+            // create track objects for position and transform tracks and push into arrays
+        }
+    },
+
     handleLayerEvent:{
         value:function (layerEvent) {
             if (layerEvent.layerID !== this.trackID) {