Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

1 files changed, 67 insertions, 24 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index bd55f2fb..6d557845 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -11,10 +11,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve
 
 var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
-    hasTemplate:{
-        value:true
-    },
-
     _trackID:{
         value:null
     },
@@ -31,11 +27,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 }
         }
     },
-    
-    _isFirstDraw: {
-        value: true
+
+    _tween:{
+        value:[]
     },
-    
+
+    tween:{
+        serializable:true,
+        get:function () {
+            return this._tween;
+        },
+        set:function (newVal) {
+            this._tween = newVal;
+        }
+    },
+
     _isVisible:{
         value: true
     },
@@ -345,15 +351,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     _positionCollapser:{
         value:null
     },
+    positionCollapser:{
+        serializable:true,
+        get:function(){
+            return this._positionCollapser;
+        },
+        set:function(val){
+            this._positionCollapser = val;
+        }
+    },
     _mainCollapser:{
         value:null
     },
+    mainCollapser:{
+        serializable:true,
+        get:function () {
+            return this._mainCollapser;
+        },
+        set:function (val) {
+            this._mainCollapser = val;
+        }
+    },
     _transformCollapser:{
         value:null
     },
+    transformCollapser:{
+        serializable:true,
+        get:function () {
+            return this._transformCollapser;
+        },
+        set:function (val) {
+            this._transformCollapser = val;
+        }
+    },
     _styleCollapser:{
         value:null
     },
+    styleCollapser:{
+        serializable:true,
+        get:function () {
+            return this._styleCollapser;
+        },
+        set:function (val) {
+            this._styleCollapser = val;
+        }
+    },
 
         // Drag and Drop properties
     _dragAndDropHelper : {
@@ -431,6 +473,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.isStyleCollapsed = this.trackData.isStyleCollapsed;
             this.trackPosition = this.trackData.trackPosition;
             this.isVisible = this.trackData.isVisible;
+            this.trackEditorProperty = "master";
             this.needsDraw = true;
         }
     },
@@ -829,14 +872,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     recreatePropertyTracks:{
         value:function(ruleSet){
-
-
             for(var i in ruleSet){
                 var styleProp = ruleSet[i][0].style[0];
-                console.log(styleProp);
-                this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp);
+                //console.log(styleProp);
+                //console.log(ruleSet[i]);
+                this.application.ninja.timeline.layerRepetition.childComponents[0].addStyle(styleProp, ruleSet[i]);
             }
-
         }
     },
 
@@ -881,8 +922,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 keyframeString += keyframePropertyString;
             }
             keyframeString += " }";
+            //console.log(keyframeString);
             // set the keyframe string as the new rule
             this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString);
+            //console.log(this.currentKeyframeRule);
             this.application.ninja.currentDocument.model.needsSave = true;
         }
     },
@@ -900,15 +943,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function(){
             // create track objects for position and transform tracks and push into arrays
 
-            // create 'top' track
-            var newTopTrack = {};
-            newTopTrack.propTrackData = {};
-            newTopTrack.propTrackData.propTweens = [];
-            newTopTrack.propTrackData.styleIndex = 0;
-            newTopTrack.propTrackData.trackType = "position";
-            newTopTrack.propTrackData.trackEditorProperty = "top";
-            this.arrPositionTracks.push(newTopTrack);
-
             // create 'left' track
             var newLeftTrack = {};
             newLeftTrack.propTrackData = {};
@@ -918,6 +952,15 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             newLeftTrack.propTrackData.trackEditorProperty = "left";
             this.arrPositionTracks.push(newLeftTrack);
 
+             // create 'top' track
+            var newTopTrack = {};
+            newTopTrack.propTrackData = {};
+            newTopTrack.propTrackData.propTweens = [];
+            newTopTrack.propTrackData.styleIndex = 0;
+            newTopTrack.propTrackData.trackType = "position";
+            newTopTrack.propTrackData.trackEditorProperty = "top";
+            this.arrPositionTracks.push(newTopTrack);
+
             // create 'width' track
             var newWidthTrack = {};
             newWidthTrack.propTrackData = {};
@@ -944,8 +987,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 return;
             }
             if (layerEvent.layerEventType === "newStyle") {
-                // TODO: Add a real track of tweens.  Probably need a method for that.
-
                 var newStyleTrack = {};
                 newStyleTrack.propTrackData = {};
                 newStyleTrack.propTrackData.styleSelection = layerEvent.styleSelection;
@@ -953,6 +994,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 newStyleTrack.propTrackData.trackType = "style";
                 newStyleTrack.propTrackData.trackEditorProperty = "";
                 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex;
+                newStyleTrack.propTrackData.existingRule = "";
 
                 this.arrStyleTracks.push(newStyleTrack);