Merge branch 'refs/heads/TimelineUberJD' into Timeline-RefactorCode

Conflicts:
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

2 files changed, 562 insertions, 9 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 752340bb..de2e5bb5 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -311,7 +311,6 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
                     splitTweenIndex = i + 1;
 
-                    // Update the next tween to have new span position and width.
                     this.propTweens[i + 1].tweenData.spanPosition = position;
                     this.propTweens[i + 1].spanPosition = position;
                     this.propTweens[i + 1].tweenData.spanWidth = this.propTweens[i + 1].tweenData.keyFramePosition - position;
@@ -324,7 +323,6 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                     }
                     this.propTweenRepetition.childComponents[nextComponentIndex].setData();
 
-                    // Create the new tween and splice it into the model
                     var newTweenToInsert = {};
                     newTweenToInsert.tweenData = {};
                     newTweenToInsert.tweenData.spanWidth = position - prevTween;
@@ -339,9 +337,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                     i = tweensLength;
                 }
             }
-
             this.application.ninja.currentDocument.model.needsSave = true;
-
             for (i = 0; i <= tweensLength + 1; i++) {
                 this.propTweens[i].tweenID = i;
                 this.propTweens[i].tweenData.tweenID = i;
@@ -418,8 +414,6 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
 
     updatePropKeyframeRule:{
         value:function(){
-            var keyframeString, keyMill, trackDur, keyframePercent, keyframePropertyString, prop, i;
-            // delete the current rule
             this.ninjaStylesContoller.deleteRule(this.currentKeyframeRule);
 
             // build the new keyframe string
@@ -438,7 +432,6 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                 keyframeString += keyframePropertyString;
             }
             keyframeString += " }";
-            // set the keyframe string as the new rule
             this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString);
             this.application.ninja.currentDocument.model.needsSave = true;
         }
@@ -453,9 +446,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
             if (currentStyleValue == null) {
                 currentStyleValue = "1px";
             }
-
             this.propTweens[0].tweenData.tweenedProperties[this.trackEditorProperty] = currentStyleValue;
-
             this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty;
             currentAnimationNameString = this.timelineTrack.animationNamesString;
             newAnimationNames = "";
@@ -481,4 +472,5 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
             this.insertPropTween(tweenEvent.offsetX);
         }
     }
+    /* ===- End Controllers ==== */
 });
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js.orig b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js.orig
new file mode 100644
index 00000000..e2e52a3b
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js.orig
@@ -0,0 +1,561 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+
+var Montage = require("montage/core/core").Montage;
+var Component = require("montage/ui/component").Component;
+
+var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
+
+    /* ===- Begin Models ==== */
+    hasTemplate:{
+        value: true
+    },
+
+<<<<<<< HEAD
+=======
+    trackEditorProperty:{
+        value:""
+    },
+
+    animatedElement:{
+        value:null
+    },
+
+    isSubproperty:{
+        value:true
+    },
+
+>>>>>>> refs/heads/TimelineUberJD
+    _propTweenRepetition:{
+        value:null
+    },
+    propTweenRepetition:{
+        get:function () {
+            return this._propTweenRepetition;
+        },
+        set:function (newVal) {
+            this._propTweenRepetition = newVal;
+        }
+    },
+
+    _propTweens:{
+        value:[]
+    },
+    propTweens:{
+        serializable:true,
+        get:function () {
+            return this._propTweens;
+        },
+        set:function (newVal) {
+            this._propTweens = newVal;
+        }
+    },
+
+    _propTrackData:{
+        value:false
+    },
+    propTrackData:{
+        serializable:true,
+        get:function () {
+            return this._propTrackData;
+        },
+        set:function (val) {
+            this._propTrackData = val;
+            if (this._propTrackData) {
+                this.setData();
+            }
+        }
+    },
+    _trackID:{
+        value:null
+    },
+    trackID:{
+        serializable:true,
+        get:function () {
+            return this._trackID;
+        },
+        set:function (value) {
+            if (value !== this._trackID) {
+                this._trackID = value;
+            }
+        }
+    },
+
+    _trackType:{
+        value:null
+    },
+    trackType:{
+        serializable:true,
+        get:function () {
+            return this._trackType;
+        },
+        set:function (value) {
+            if (value !== this._trackType) {
+                this._trackType = value;
+            }
+        }
+    },
+
+    _styleIndex:{
+        value:null
+    },
+    styleIndex:{
+        serializable:true,
+        get:function () {
+            return this._styleIndex;
+        },
+        set:function (value) {
+            if (value !== this._styleIndex) {
+                this._styleIndex = value;
+            }
+        }
+    },
+
+    trackEditorProperty:{
+        value:""
+    },
+
+    animatedElement:{
+        value:null
+    },
+
+    isSubproperty:{
+        value:true