aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/Layer.js
diff options
context:
space:
mode:
authorJonathan Duran2012-05-08 13:42:04 -0700
committerJonathan Duran2012-05-08 13:42:04 -0700
commit4f1693b953befabf4495df668f542c7f52270864 (patch)
treed7d87b0be39d47d55685b0cbc2ddc9db39abc7c7 /js/panels/Timeline/Layer.reel/Layer.js
parenta831e11ef6ae97bbd90c896b5cb6f4306e9001dd (diff)
downloadninja-4f1693b953befabf4495df668f542c7f52270864.tar.gz
Change sub property track arrays
Remove transform section and move width and height into Position section. rename position section Position and Size. additional support for generic prop tweens Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.js')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js90
1 files changed, 1 insertions, 89 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 233e811f..c9dd5328 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -147,7 +147,7 @@ var Layer = exports.Layer = Montage.create(Component, {
147 } 147 }
148 }, 148 },
149 149
150 /* Position and Transform hottext values */ 150 /* Position and Size hottext values */
151 _dtextPositionX : { 151 _dtextPositionX : {
152 value:null 152 value:null
153 }, 153 },
@@ -220,60 +220,6 @@ var Layer = exports.Layer = Montage.create(Component, {
220 } 220 }
221 }, 221 },
222 222
223 _dtextSkewX : {
224 value:null
225 },
226
227 dtextSkewX:{
228 serializable: true,
229 get:function(){
230 return this._dtextSkewX;
231 },
232 set:function(value){
233 if (this._dtextSkewX !== value) {
234 this._dtextSkewX = value;
235 this.layerData.dtextSkewX = value;
236 }
237
238 }
239 },
240
241 _dtextSkewY : {
242 value:null
243 },
244
245 dtextSkewY:{
246 serializable: true,
247 get:function(){
248 return this._dtextSkewY;
249 },
250 set:function(value){
251 if (this._dtextSkewY !== value) {
252 this._dtextSkewY = value;
253 this.layerData.dtextSkewY = value;
254 }
255
256 }
257 },
258
259 _dtextRotate : {
260 value:null
261 },
262
263 dtextRotate:{
264 serializable: true,
265 get:function(){
266 return this._dtextRotate;
267 },
268 set:function(value){
269 if (this._dtextRotate !== value) {
270 this._dtextRotate = value;
271 this.layerData.dtextRotate = value;
272 }
273
274 }
275 },
276
277 /* isSelected: whether or not the layer is currently selected. */ 223 /* isSelected: whether or not the layer is currently selected. */
278 _isSelected:{ 224 _isSelected:{
279 value: false 225 value: false
@@ -372,20 +318,6 @@ var Layer = exports.Layer = Montage.create(Component, {
372 } 318 }
373 }, 319 },
374 320
375 _isTransformCollapsed : {
376 value: true
377 },
378 isTransformCollapsed : {
379 serializable: true,
380 get: function() {
381 return this._isTransformCollapsed;
382 },
383 set: function(newVal) {
384 this._isTransformCollapsed = newVal;
385 this.layerData.isTransformCollapsed = newVal;
386 }
387 },
388
389 _isPositionCollapsed : { 321 _isPositionCollapsed : {
390 value: true 322 value: true
391 }, 323 },
@@ -469,7 +401,6 @@ var Layer = exports.Layer = Montage.create(Component, {
469 this.arrLayerStyles = this.layerData.arrLayerStyles; 401 this.arrLayerStyles = this.layerData.arrLayerStyles;
470 this.isMainCollapsed = this.layerData.isMainCollapsed; 402 this.isMainCollapsed = this.layerData.isMainCollapsed;
471 this.isPositionCollapsed = this.layerData.isPositionCollapsed; 403 this.isPositionCollapsed = this.layerData.isPositionCollapsed;
472 this.isTransformCollapsed = this.layerData.isTransformCollapsed;
473 this.isSelected = this.layerData.isSelected; 404 this.isSelected = this.layerData.isSelected;
474 this.isActive = this.layerData.isActive; 405 this.isActive = this.layerData.isActive;
475 this.isStyleCollapsed = this.layerData.isStyleCollapsed; 406 this.isStyleCollapsed = this.layerData.isStyleCollapsed;
@@ -537,7 +468,6 @@ var Layer = exports.Layer = Montage.create(Component, {
537 // Collapser event handlers. 468 // Collapser event handlers.
538 this.mainCollapser.clicker.addEventListener("click", this.handleMainCollapserClick.bind(this), false); 469 this.mainCollapser.clicker.addEventListener("click", this.handleMainCollapserClick.bind(this), false);
539 this.positionCollapser.clicker.addEventListener("click", this.handlePositionCollapserClick.bind(this), false); 470 this.positionCollapser.clicker.addEventListener("click", this.handlePositionCollapserClick.bind(this), false);
540 this.transformCollapser.clicker.addEventListener("click", this.handleTransformCollapserClick.bind(this), false);
541 this.styleCollapser.clicker.addEventListener("click", this.handleStyleCollapserClick.bind(this), false); 471 this.styleCollapser.clicker.addEventListener("click", this.handleStyleCollapserClick.bind(this), false);
542 472
543 // Add event listeners to add and delete style buttons 473 // Add event listeners to add and delete style buttons
@@ -595,11 +525,6 @@ var Layer = exports.Layer = Montage.create(Component, {
595 this.positionCollapser.myContent.classList.remove(this.positionCollapser.collapsedClass); 525 this.positionCollapser.myContent.classList.remove(this.positionCollapser.collapsedClass);
596 this.positionCollapser.clicker.classList.remove(this.positionCollapser.collapsedClass); 526 this.positionCollapser.clicker.classList.remove(this.positionCollapser.collapsedClass);
597 } 527 }
598 if (this.isTransformCollapsed === false) {
599 this.transformCollapser.myContent.style.height = "auto";
600 this.transformCollapser.myContent.classList.remove(this.transformCollapser.collapsedClass);
601 this.transformCollapser.clicker.classList.remove(this.transformCollapser.collapsedClass);
602 }
603 if (this.isStyleCollapsed === false) { 528 if (this.isStyleCollapsed === false) {
604 this.styleCollapser.myContent.style.height = "auto"; 529 this.styleCollapser.myContent.style.height = "auto";
605 this.styleCollapser.myContent.classList.remove(this.styleCollapser.collapsedClass); 530 this.styleCollapser.myContent.classList.remove(this.styleCollapser.collapsedClass);
@@ -823,19 +748,6 @@ var Layer = exports.Layer = Montage.create(Component, {
823 this.triggerOutgoingBinding(); 748 this.triggerOutgoingBinding();
824 } 749 }
825 }, 750 },
826 handleTransformCollapserClick : {
827 value: function(event) {
828 this.transformCollapser.bypassAnimation = false;
829 this.bypassAnimation = false;
830 this.layerData.bypassAnimation = false;
831 if (this.isTransformCollapsed) {
832 this.isTransformCollapsed = false;
833 } else {
834 this.isTransformCollapsed = true;
835 }
836 this.triggerOutgoingBinding();
837 }
838 },
839 handleStyleCollapserClick : { 751 handleStyleCollapserClick : {
840 value: function(event) { 752 value: function(event) {
841 this.styleCollapser.bypassAnimation = false; 753 this.styleCollapser.bypassAnimation = false;