Merge branch 'timeline-local' into timeline-multiselect

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	resolved using theirs. (selectLayers)

1 files changed, 82 insertions, 139 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index f2e20d41..b0f6d220 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -36,13 +36,10 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     /* Style models: the array of styles, and the repetition that uses them */
     _arrLayerStyles : {
-        serializable: true,
-                enumerable: true,
             value: []
     },
     arrLayerStyles : {
         serializable: true,
-        enumerable: true,
         get: function() {
                 return this._arrLayerStyles;
         },
@@ -54,6 +51,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         value: false
     },
     styleRepetition : {
+        serializable: true,
         get: function() {
                 return this._styleRepetition;
         },
@@ -64,8 +62,17 @@ var Layer = exports.Layer = Montage.create(Component, {
     _styleCounter : {
         value: 0
     },
+    styleCounter:{
+        serializable:true,
+        get:function () {
+            return this._styleCounter;
+        },
+        set:function (newVal) {
+            this._styleCounter = newVal;
+        }
+    },
 
-        /* Layer models: the name, ID, and selected and animation booleans for the layer */
+    /* Layer models: the name, ID, and selected and animation booleans for the layer */
     _layerName:{
         value: "Default Layer Name"
     },
@@ -76,13 +83,13 @@ var Layer = exports.Layer = Montage.create(Component, {
             return this._layerName;
         },
         set:function(newVal){
-
                         this._layerEditable.value = newVal;
                 this._layerName = newVal;
                 this.layerData.layerName = newVal;
                 if (typeof(this.dynamicLayerName) !== "undefined") {
                         this.dynamicLayerName.value = newVal;
                 }
+
         }
     },
     _layerID:{
@@ -140,10 +147,9 @@ var Layer = exports.Layer = Montage.create(Component, {
         }
     },
     
-    /* Position and Transform hottext values */
+    /* Position and Size hottext values */
     _dtextPositionX : {
-        value:null,
-        serializable: true
+        value:null
     },
 
     dtextPositionX:{
@@ -161,8 +167,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     },
     
     _dtextPositionY : {
-        value:null,
-        serializable: true
+        value:null
     },
 
     dtextPositionY:{
@@ -180,8 +185,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     },
     
     _dtextScaleX : {
-        value:null,
-        serializable: true
+        value:null
     },
 
     dtextScaleX:{
@@ -199,8 +203,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     },
     
     _dtextScaleY : {
-        value:null,
-        serializable: true
+        value:null
     },
 
     dtextScaleY:{
@@ -217,69 +220,9 @@ var Layer = exports.Layer = Montage.create(Component, {
         }
     },
     
-    _dtextSkewX : {
-        value:null,
-        serializable: true
-    },
-
-    dtextSkewX:{
-        serializable: true,
-        get:function(){
-            return this._dtextSkewX;
-        },
-        set:function(value){
-                if (this._dtextSkewX !== value) {
-                        this._dtextSkewX = value;
-                        this.layerData.dtextSkewX = value;
-                }
-            
-        }
-    },
-    
-    _dtextSkewY : {
-        value:null,
-        serializable: true
-    },
-
-    dtextSkewY:{
-        serializable: true,
-        get:function(){
-            return this._dtextSkewY;
-        },
-        set:function(value){
-                if (this._dtextSkewY !== value) {
-                        this._dtextSkewY = value;
-                        this.layerData.dtextSkewY = value;
-                }
-            
-        }
-    },
-    
-    _dtextRotate : {
-        value:null,
-        serializable: true
-    },
-
-    dtextRotate:{
-        serializable: true,
-        get:function(){
-            return this._dtextRotate;
-        },
-        set:function(value){
-                if (this._dtextRotate !== value) {
-                        this._dtextRotate = value;
-                        this.layerData.dtextRotate = value;
-                }
-            
-        }
-    },
-    
     /* isSelected: whether or not the layer is currently selected. */
     _isSelected:{
-        value: false,
-        writable: true,
-        serializable: true,
-        enumerable: false
+        value: false
     },
 
     isSelected:{
@@ -319,9 +262,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     
     _isAnimated:{
-        value: false,
-        writable: true,
-        enumerable: false
+        value: false
     },
 
     isAnimated:{
@@ -363,7 +304,6 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     // Are the various collapsers collapsed or not
     _isMainCollapsed : {
-        serializable: true,
         value: true
     },
     isMainCollapsed : {
@@ -378,23 +318,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         }
     },
     
-    _isTransformCollapsed : {
-        serializable: true,
-        value: true
-    },
-    isTransformCollapsed : {
-        serializable: true,
-        get: function() {
-                return this._isTransformCollapsed;
-        },