1 files changed, 75 insertions, 109 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index b23da749..b0f6d220 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -51,6 +51,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         value: false
     },
     styleRepetition : {
+        serializable: true,
         get: function() {
                 return this._styleRepetition;
         },
@@ -61,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"
     },
@@ -73,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:{
@@ -137,7 +147,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         }
     },
     
-    /* Position and Transform hottext values */
+    /* Position and Size hottext values */
     _dtextPositionX : {
         value:null
     },
@@ -210,60 +220,6 @@ var Layer = exports.Layer = Montage.create(Component, {
         }
     },
     
-    _dtextSkewX : {
-        value:null
-    },
-
-    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
-    },
-
-    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
-    },
-
-    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
@@ -362,20 +318,6 @@ var Layer = exports.Layer = Montage.create(Component, {
         }
     },
     
-    _isTransformCollapsed : {
-        value: true
-    },
-    isTransformCollapsed : {
-        serializable: true,
-        get: function() {
-                return this._isTransformCollapsed;
-        },
-        set: function(newVal) {
-                        this._isTransformCollapsed = newVal;
-                        this.layerData.isTransformCollapsed = newVal;
-        }
-    },
-    
     _isPositionCollapsed : {
         value: true
     },
@@ -459,7 +401,6 @@ var Layer = exports.Layer = Montage.create(Component, {
             this.arrLayerStyles = this.layerData.arrLayerStyles;
             this.isMainCollapsed = this.layerData.isMainCollapsed;
             this.isPositionCollapsed = this.layerData.isPositionCollapsed;
-            this.isTransformCollapsed = this.layerData.isTransformCollapsed;
             this.isSelected = this.layerData.isSelected;
             this.isActive = this.layerData.isActive;
             this.isStyleCollapsed = this.layerData.isStyleCollapsed;
@@ -471,7 +412,7 @@ var Layer = exports.Layer = Montage.create(Component, {
             this.dtextScaleX = this.layerData.dtextScaleX;
             this.dtextScaleY = this.layerData.dtextScaleY;
             this.dtextRotate = this.layerData.dtextRotate;
-            this._isFirstDraw = this.layerData._isFirstDraw;
+            //this._isFirstDraw = this.layerData._isFirstDraw;
             this.layerTag = this.layerData.layerTag;
             this.isVisible = this.layerData.isVisible;
             this.isAnimated = this.layerData.isAnimated;
@@ -527,7 +468,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                 // Collapser event handlers.
             this.mainCollapser.clicker.addEventListener("click", this.handleMainCollapserClick.bind(this), false);
             this.positionCollapser.clicker.addEventListener("click", this.handlePositionCollapserClick.bind(this), false);
-            this.transformCollapser.clicker.addEventListener("click", this.handleTransformCollapserClick.bind(this), false);
             this.styleCollapser.clicker.addEventListener("click", this.handleStyleCollapserClick.bind(this), false);
 
             // Add event listeners to add and delete style buttons
@@ -545,6 +485,11 @@ var Layer = exports.Layer = Montage.create(Component, {
                         this.element.addEventListener("dragleave", this.handleDragleave.bind(this), false);
                         this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
                         this.element.addEventListener("drop", this.handleDrop.bind(this), false);
+
+            this.eventManager.addEventListener("updatedID", this, false);
+                        
+
+
         }
     },
     draw: {
@@ -570,7 +515,28 @@ var Layer = exports.Layer = Montage.create(Component, {
                         }
                         this._isFirstDraw = false;
                         this.layerData._isFirstDraw = false;
+                        
+                        if (this.isMainCollapsed === false) {
+                                        this.mainCollapser.myContent.style.height = "auto";
+                                        this.mainCollapser.myContent.classList.remove(this.mainCollapser.collapsedClass);
+                                        this.mainCollapser.clicker.classList.remove(this.mainCollapser.collapsedClass);
+
+                        }
+                        if (this.isPositionCollapsed === false) {
+                                        this.positionCollapser.myContent.style.height = "auto";
+                                        this.positionCollapser.myContent.classList.remove(this.positionCollapser.collapsedClass);
+                                        this.positionCollapser.clicker.classList.remove(this.positionCollapser.collapsedClass);
+                        }
+                        if (this.isStyleCollapsed === false) {
+                                        this.styleCollapser.myContent.style.height = "auto";
+                                        this.styleCollapser.myContent.classList.remove(this.styleCollapser.collapsedClass);
+                                        this.styleCollapser.clicker.classList.remove(this.styleCollapser.collapsedClass);
+                        }
+                        
                 }
+