aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJon Reid2012-02-24 14:06:57 -0800
committerJon Reid2012-02-24 14:06:57 -0800
commit1c4e8fbab587e589f348223847d6aac5c2df416b (patch)
tree8cb20022b98fe243c6d76d0b5b3f056263c49ff7 /js/panels
parentae94ea8c3a419ed29fa0c4c16a817e3fea469901 (diff)
downloadninja-1c4e8fbab587e589f348223847d6aac5c2df416b.tar.gz
Timeline: Bug fixes: Delete corresponding track when a style is deleted from a layer, and fix serialization variable problem.
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html14
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js2
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 @@
93 } 93 }
94 } 94 }
95 }, 95 },
96 "dtext-position-x" : { 96 "dtext_position_x" : {
97 "module": "js/components/hottextunit.reel", 97 "module": "js/components/hottextunit.reel",
98 "name": "HotTextUnit", 98 "name": "HotTextUnit",
99 "properties": { 99 "properties": {
@@ -112,7 +112,7 @@
112 } 112 }
113 } 113 }
114 }, 114 },
115 "dtext-position-y" : { 115 "dtext_position_y" : {
116 "module": "js/components/hottextunit.reel", 116 "module": "js/components/hottextunit.reel",
117 "name": "HotTextUnit", 117 "name": "HotTextUnit",
118 "properties": { 118 "properties": {
@@ -131,7 +131,7 @@
131 } 131 }
132 } 132 }
133 }, 133 },
134 "dtext-scale-x" : { 134 "dtext_scale_x" : {
135 "module": "js/components/hottextunit.reel", 135 "module": "js/components/hottextunit.reel",
136 "name": "HotTextUnit", 136 "name": "HotTextUnit",
137 "properties": { 137 "properties": {
@@ -150,7 +150,7 @@
150 } 150 }
151 } 151 }
152 }, 152 },
153 "dtext-scale-y" : { 153 "dtext_scale_y" : {
154 "module": "js/components/hottextunit.reel", 154 "module": "js/components/hottextunit.reel",
155 "name": "HotTextUnit", 155 "name": "HotTextUnit",
156 "properties": { 156 "properties": {
@@ -169,7 +169,7 @@
169 } 169 }
170 } 170 }
171 }, 171 },
172 "dtext-skew-x" : { 172 "dtext_skew_x" : {
173 "module": "js/components/hottextunit.reel", 173 "module": "js/components/hottextunit.reel",
174 "name": "HotTextUnit", 174 "name": "HotTextUnit",
175 "properties": { 175 "properties": {
@@ -188,7 +188,7 @@
188 } 188 }
189 } 189 }
190 }, 190 },
191 "dtext-skew-y" : { 191 "dtext_skew_y" : {
192 "module": "js/components/hottextunit.reel", 192 "module": "js/components/hottextunit.reel",
193 "name": "HotTextUnit", 193 "name": "HotTextUnit",
194 "properties": { 194 "properties": {
@@ -207,7 +207,7 @@
207 } 207 }
208 } 208 }
209 }, 209 },
210 "dtext-rotate" : { 210 "dtext_rotate" : {
211 "module": "js/components/hottextunit.reel", 211 "module": "js/components/hottextunit.reel",
212 "name": "HotTextUnit", 212 "name": "HotTextUnit",
213 "properties": { 213 "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, {
652 this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation; 652 this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation;
653 this._styleCollapser.handleCollapserLabelClick(); 653 this._styleCollapser.handleCollapserLabelClick();
654 } 654 }
655 } else if (layerEvent.layerEventType === "deleteStyle") {
656 this.arrStyleTracks.pop();
655 } 657 }
656 } 658 }
657 } 659 }