1 files changed, 18 insertions, 109 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index c213cb70..130dd044 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"
     },
@@ -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;
@@ -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
@@ -585,11 +525,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                                         this.positionCollapser.myContent.classList.remove(this.positionCollapser.collapsedClass);
                                         this.positionCollapser.clicker.classList.remove(this.positionCollapser.collapsedClass);
                         }
-                        if (this.isTransformCollapsed === false) {
-                                        this.transformCollapser.myContent.style.height = "auto";
-                                        this.transformCollapser.myContent.classList.remove(this.transformCollapser.collapsedClass);
-                                        this.transformCollapser.clicker.classList.remove(this.transformCollapser.collapsedClass);
-                        }
                         if (this.isStyleCollapsed === false) {
                                         this.styleCollapser.myContent.style.height = "auto";
                                         this.styleCollapser.myContent.classList.remove(this.styleCollapser.collapsedClass);
@@ -622,7 +557,7 @@ var Layer = exports.Layer = Montage.create(Component, {
                         // Or at the end, if no rule is selected.
 
                         var newLength = 0, 
-                                mySelection = 0,
+                                // mySelection = 0,
                                 // newStyle = LayerStyle.create(),
                                 newStyle = {},
                                 newEvent = document.createEvent("CustomEvent");
@@ -635,7 +570,8 @@ var Layer = exports.Layer = Montage.create(Component, {
                         newEvent.layerEventLocale = "styles";
                         newEvent.layerEventType = "newStyle";
                         newEvent.layerID = this.layerID;
-                        newEvent.styleID = this.layerID + "@" + this._styleCounter;
+            newEvent.styleIndex = this.styleCounter;
+                        newEvent.styleID = this.layerID + "@" + this.styleCounter; // is this property needed?
                         
                         newStyle.styleID = newEvent.styleID;
                         newStyle.whichView = "hintable";
@@ -643,26 +579,12 @@ var Layer = exports.Layer = Montage.create(Component, {
                         newStyle.editorValue = "";
                         newStyle.ruleTweener = false;
                         newStyle.isSelected = false;
+            this.arrLayerStyles.push(newStyle);
 
-                        if (!!this.styleRepetition.selectedIndexes) {
-                                mySelection = this.styleRepetition.selectedIndexes[0];
-                                this.arrLayerStyles.splice(mySelection, 0, newStyle);
-                                //this.styleRepetition.selectedIndexes = [mySelection];
-                                this.selectStyle(mySelection);
-                        } else {
-                                newLength = this.arrLayerStyles.length;
-                                this.arrLayerStyles.push(newStyle);
-                                mySelection = this.arrLayerStyles.length;
-                                // this.styleRepetition.selectedIndexes = [mySelection-1];
-                                this.selectStyle(mySelection-1);
-                        }
-                        
                         // Set up the event info and dispatch the event
-
-                        newEvent.styleSelection = mySelection;
+            this.styleCounter += 1;
+                        // newEvent.styleSelection = mySelection;
                         defaultEventManager.dispatchEvent(newEvent);
-
-
                 }