aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/Layer.js
diff options
context:
space:
mode:
authorEric Guzman2012-02-29 16:13:19 -0800
committerEric Guzman2012-02-29 16:13:19 -0800
commit53bdb1e7773069c4cca59e88d6da91cd0f58c94a (patch)
tree44a2147fcbb43ea483f78a1e2e082919f9c81970 /js/panels/Timeline/Layer.reel/Layer.js
parentb2c60efb9c6f5dfa7b0fc5c2b9feebebc805ed97 (diff)
parentb09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff)
downloadninja-53bdb1e7773069c4cca59e88d6da91cd0f58c94a.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.js')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js135
1 files changed, 134 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index f62c0b90..d50360e6 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -107,6 +107,140 @@ var Layer = exports.Layer = Montage.create(Component, {
107 } 107 }
108 }, 108 },
109 109
110 /* Position and Transform hottext values */
111 _dtextPositionX : {
112 value:null,
113 serializable: true,
114 },
115
116 dtextPositionX:{
117 serializable: true,
118 get:function(){
119 return this._dtextPositionX;
120 },
121 set:function(value){
122 if (this._dtextPositionX !== value) {
123 this._dtextPositionX = value;
124 this.needsDraw = true;
125 }
126
127 }
128 },
129
130 _dtextPositionY : {
131 value:null,
132 serializable: true,
133 },
134
135 dtextPositionY:{
136 serializable: true,
137 get:function(){
138 return this._dtextPositionY;
139 },
140 set:function(value){
141 if (this._dtextPositionY !== value) {
142 this._dtextPositionY = value;
143 this.needsDraw = true;
144 }
145
146 }
147 },
148
149 _dtextScaleX : {
150 value:null,
151 serializable: true,
152 },
153
154 dtextScaleX:{
155 serializable: true,
156 get:function(){
157 return this._dtextScaleX;
158 },
159 set:function(value){
160 if (this._dtextScaleX !== value) {
161 this._dtextScaleX = value;
162 this.needsDraw = true;
163 }
164
165 }
166 },
167
168 _dtextScaleY : {
169 value:null,
170 serializable: true,
171 },
172
173 dtextScaleY:{
174 serializable: true,
175 get:function(){
176 return this._dtextScaleY;
177 },
178 set:function(value){
179 if (this._dtextScaleY !== value) {
180 this._dtextScaleY = value;
181 this.needsDraw = true;
182 }
183
184 }
185 },
186
187 _dtextSkewX : {
188 value:null,
189 serializable: true,
190 },
191
192 dtextSkewX:{
193 serializable: true,
194 get:function(){
195 return this._dtextSkewX;
196 },
197 set:function(value){
198 if (this._dtextSkewX !== value) {
199 this._dtextSkewX = value;
200 this.needsDraw = true;
201 }
202
203 }
204 },
205
206 _dtextSkewY : {
207 value:null,
208 serializable: true,
209 },
210
211 dtextSkewY:{
212 serializable: true,
213 get:function(){
214 return this._dtextSkewY;
215 },
216 set:function(value){
217 if (this._dtextSkewY !== value) {
218 this._dtextSkewY = value;
219 this.needsDraw = true;
220 }
221
222 }
223 },
224
225 _dtextRotate : {
226 value:null,
227 serializable: true,
228 },
229
230 dtextRotate:{
231 serializable: true,
232 get:function(){
233 return this._dtextRotate;
234 },
235 set:function(value){
236 if (this._dtextRotate !== value) {
237 this._dtextRotate = value;
238 this.needsDraw = true;
239 }
240
241 }
242 },
243
110 /* isSelected: whether or not the layer is currently selected. */ 244 /* isSelected: whether or not the layer is currently selected. */
111 _isSelected:{ 245 _isSelected:{
112 value: false, 246 value: false,
@@ -375,7 +509,6 @@ var Layer = exports.Layer = Montage.create(Component, {
375 this.styleCollapser.bypassAnimation = true; 509 this.styleCollapser.bypassAnimation = true;
376 this.styleCollapser.toggle(); 510 this.styleCollapser.toggle();
377 } 511 }
378
379 if (this.isSelected) { 512 if (this.isSelected) {
380 this.element.classList.add("selected"); 513 this.element.classList.add("selected");
381 } else { 514 } else {