Timeline: Bug fixes: Delete corresponding track when a style is deleted from a layer, and fix serialization variable problem.

2 files changed, 9 insertions, 7 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index d30ef0e3..0bd448f7 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -93,7 +93,7 @@
                                 }
                         }
                     },
-                                "dtext-position-x" : {
+                                "dtext_position_x" : {
                     "module": "js/components/hottextunit.reel",
                     "name": "HotTextUnit",
                     "properties": {
@@ -112,7 +112,7 @@
                             }
                         }
                                 },
-                                "dtext-position-y" : {
+                                "dtext_position_y" : {
                     "module": "js/components/hottextunit.reel",
                     "name": "HotTextUnit",
                     "properties": {
@@ -131,7 +131,7 @@
                             }
                         }
                                 },
-                                "dtext-scale-x" : {
+                                "dtext_scale_x" : {
                     "module": "js/components/hottextunit.reel",
                     "name": "HotTextUnit",
                     "properties": {
@@ -150,7 +150,7 @@
                             }
                         }
                                 },
-                                "dtext-scale-y" : {
+                                "dtext_scale_y" : {
                     "module": "js/components/hottextunit.reel",
                     "name": "HotTextUnit",
                     "properties": {
@@ -169,7 +169,7 @@
                             }
                         }
                                 },
-                                "dtext-skew-x" : {
+                                "dtext_skew_x" : {
                     "module": "js/components/hottextunit.reel",
                     "name": "HotTextUnit",
                     "properties": {
@@ -188,7 +188,7 @@
                             }
                         }
                                 },
-                                "dtext-skew-y" : {
+                                "dtext_skew_y" : {
                     "module": "js/components/hottextunit.reel",
                     "name": "HotTextUnit",
                     "properties": {
@@ -207,7 +207,7 @@
                             }
                         }
                                 },
-                                "dtext-rotate" : {
+                                "dtext_rotate" : {
                     "module": "js/components/hottextunit.reel",
                     "name": "HotTextUnit",
                     "properties": {
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 27177a69..30280727 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -652,6 +652,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                         this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation;
                         this._styleCollapser.handleCollapserLabelClick();
                 }
+            } else if (layerEvent.layerEventType === "deleteStyle") {
+                this.arrStyleTracks.pop();
             }
         }
     }