Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 346 insertions, 346 deletions

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 11d275ce..f9c710c6 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -45,10 +45,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             return this._trackID;
         },
         set:function (value) {
-                if (value !== this._trackID) {
-                        this._trackID = value;
+            if (value !== this._trackID) {
+                this._trackID = value;
                 this.trackData.layerID = value;
-                }
+            }
         }
     },
 
@@ -69,9 +69,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     positionPropertyTrack:{
         value:null
     },
-    
+
     _isFirstDraw: {
-        value: true
+        value: true
     },
 
     _isVisible:{
@@ -83,31 +83,31 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             return this._isVisible;
         },
         set:function(value){
-                if (this._isVisible !== value) {
-                        this._isVisible = value;
-                        if (this.element !== null) {
-                                if (value === true) {
-                                        this.element.classList.remove("layer-hidden");
-                                } else {
-                                        this.element.classList.add("layer-hidden");
-                                }
-                        }
-                }
-                this.trackData.isVisible = value;
+            if (this._isVisible !== value) {
+                this._isVisible = value;
+                if (this.element !== null) {
+                    if (value === true) {
+                        this.element.classList.remove("layer-hidden");
+                    } else {
+                        this.element.classList.add("layer-hidden");
+                    }
+                }
+            }
+            this.trackData.isVisible = value;
         }
     },
-    
+
     _stageElement: {
-        value: null
+        value: null
     },
     stageElement: {
-        get: function() {
-                return this._stageElement;
-        },
-        set: function(newVal) {
-                this._stageElement = newVal;
-                this.trackData.stageElement = newVal;
-        }
+        get: function() {
+            return this._stageElement;
+        },
+        set: function(newVal) {
+            this._stageElement = newVal;
+            this.trackData.stageElement = newVal;
+        }
     },
 
     // Are the various collapsers collapsed or not
@@ -160,88 +160,88 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         }
     },
     _bypassAnimation : {
-        value: false
+        value: false
     },
     bypassAnimation : {
-        serializable: true,
-        get: function() {
-                return this._bypassAnimation;
-        },
-        set: function(newVal) {
-                if (typeof(this.trackData) !== "undefined") {
-                        this._bypassAnimation = newVal;
+        serializable: true,
+        get: function() {
+            return this._bypassAnimation;
+        },
+        set: function(newVal) {
+            if (typeof(this.trackData) !== "undefined") {
+                this._bypassAnimation = newVal;
                 this.trackData.bypassAnimation = newVal;
-                }
-        }
+            }
+        }
     },
-    
+
     _arrStyleTracks : {
-        value: []
+        value: []
     },
     arrStyleTracks: {
         serializable:true,
-        get: function() {
-                return this._arrStyleTracks;
-        },
-        set: function(newVal) {
-                this._arrStyleTracks = newVal;
+        get: function() {
+            return this._arrStyleTracks;
+        },
+        set: function(newVal) {
+            this._arrStyleTracks = newVal;
             this.trackData.arrStyleTracks = newVal;
-        }
+        }
     },
     _styleTracksRepetition: {
-        value: null
+        value: null
     },
     styleTracksRepetition : {
         serializable:true,
-        get: function() {
-                return this._styleTracksRepetition;
-        },
-        set: function(newVal) {
-                this._styleTracksRepetition = newVal;
-        }
-    },
-    
+        get: function() {
+            return this._styleTracksRepetition;
+        },
+        set: function(newVal) {
+            this._styleTracksRepetition = newVal;
+        }
+    },
+
     /* Position Property Tracks */
     _arrPositionTracks : {
-        value: []
+        value: []
     },
     arrPositionTracks: {
         serializable:true,
-        get: function() {
-                return this._arrPositionTracks;
-        },
-        set: function(newVal) {
-                this._arrPositionTracks = newVal;
-                this.trackData.arrPositionTracks = newVal;
-            
-        }
+        get: function() {
+            return this._arrPositionTracks;
+        },
+        set: function(newVal) {
+            this._arrPositionTracks = newVal;
+            this.trackData.arrPositionTracks = newVal;
+
+        }
     },
     _positionTracksRepetition: {
-        value: null
+        value: null
     },
     positionTracksRepetition : {
-        get: function() {
-                return this._positionTracksRepetition;
-        },
-        set: function(newVal) {
-                this._positionTracksRepetition = newVal;
-        }
+        get: function() {
+            return this._positionTracksRepetition;
+        },
+        set: function(newVal) {
+            this._positionTracksRepetition = newVal;
+        }
     },
 
 
     /* Transform Property Tracks */
     _arrTransformTracks : {
-        value: []
+        value: []
     },
     arrTransformTracks: {
         serializable:true,
-        get: function() {
-                return this._arrTransformTracks;
-        },
-        set: function(newVal) {
-                this._arrTransformTracks = newVal;
+        get: function() {
+            return this._arrTransformTracks;
+        },
+        set: function(newVal) {
+            this._arrTransformTracks = newVal;