aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-08 16:25:26 -0800
committerJose Antonio Marquez2012-03-08 16:25:26 -0800
commit3bcdfaa322ac53609b66ecedbace1872048fd310 (patch)
tree5202930aadf0b5da7bb4d79a9f4498b49a13ec3c /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
parentb752f7fced5dfb5d16b6f32fadb48bc7e7fdbc28 (diff)
parent3a9c7a57a227a36ec47c6635fc6a0bd4c4b7f9c3 (diff)
downloadninja-3bcdfaa322ac53609b66ecedbace1872048fd310.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Conflicts: js/document/html-document.js js/helper-classes/3D/draw-utils.js
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js116
1 files changed, 5 insertions, 111 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 7120298c..669dabef 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -57,7 +57,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
57 set:function (newVal) { 57 set:function (newVal) {
58 if (newVal !== this._isTransformCollapsed) { 58 if (newVal !== this._isTransformCollapsed) {
59 this._isTransformCollapsed = newVal; 59 this._isTransformCollapsed = newVal;
60 this.needsDraw = true;
61 } 60 }
62 } 61 }
63 }, 62 },
@@ -71,7 +70,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
71 set:function (newVal) { 70 set:function (newVal) {
72 if (newVal !== this._isPositionCollapsed) { 71 if (newVal !== this._isPositionCollapsed) {
73 this._isPositionCollapsed = newVal; 72 this._isPositionCollapsed = newVal;
74 this.needsDraw = true;
75 } 73 }
76 } 74 }
77 }, 75 },
@@ -85,21 +83,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
85 set:function (newVal) { 83 set:function (newVal) {
86 if (newVal !== this._isStyleCollapsed) { 84 if (newVal !== this._isStyleCollapsed) {
87 this._isStyleCollapsed = newVal; 85 this._isStyleCollapsed = newVal;
88 this.needsDraw = true;
89 } 86 }
90 } 87 }
91 }, 88 },
92 _animateCollapser : { 89 _bypassAnimation : {
93 serializable: true, 90 serializable: true,
94 value: false 91 value: false
95 }, 92 },
96 animateCollapser : { 93 bypassAnimation : {
97 serializable: true, 94 serializable: true,
98 get: function() { 95 get: function() {
99 return this._animateCollapser; 96 return this._bypassAnimation;
100 }, 97 },
101 set: function(newVal) { 98 set: function(newVal) {
102 this._animateCollapser = newVal; 99 //console.log("timelinetrack bypassAnimation setter " + newVal)
100 this._bypassAnimation = newVal;
103 } 101 }
104 }, 102 },
105 103
@@ -584,110 +582,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
584 582
585 this.arrPositionTracks = [0, 1]; 583 this.arrPositionTracks = [0, 1];
586 this.arrTransformTracks = [0, 1, 2, 3, 4]; 584 this.arrTransformTracks = [0, 1, 2, 3, 4];
587
588 this.label = this.element.querySelector(".label-main");
589 this.myContent = this.element.querySelector(".content-main");
590 this.labelPosition = this.element.querySelector(".label-position");
591 this.contentPosition = this.element.querySelector(".content-position");
592 this.labelTransform = this.element.querySelector(".label-transform");
593 this.contentTransform = this.element.querySelector(".content-transform");
594 this.labelStyles = this.element.querySelector(".label-styles");
595 this.contentStyles = this.element.querySelector(".content-styles");
596
597 this._mainCollapser = Collapser.create();
598 this._mainCollapser.clicker = this.label;
599 this._mainCollapser.myContent = this.myContent;
600 this._mainCollapser.contentHeight = 60;
601 this._mainCollapser.isLabelClickable = false;
602 this._mainCollapser.element = this.myContent;
603 this._mainCollapser.isCollapsed = this.isMainCollapsed;
604 this._mainCollapser.isAnimated = true;
605 Object.defineBinding(this._mainCollapser, "isToggling", {
606 boundObject: this,
607 boundObjectPropertyPath: "isMainCollapsed",
608 oneway: false
609 });
610 Object.defineBinding(this._mainCollapser, "bypassAnimation", {
611 boundObject: this,
612 boundObjectPropertyPath: "animateCollapser",
613 oneway: false,
614 boundValueMutator: function(value) {
615 return !value;
616 }
617 });
618
619 /*
620 this._mainCollapser.labelClickEvent = function () {
621 that.isMainCollapsed = that._mainCollapser.isCollapsed;
622 };
623 */
624 //this._mainCollapser.needsDraw = true;
625
626 this._positionCollapser = Collapser.create();
627 this._positionCollapser.clicker = this.labelPosition;
628 this._positionCollapser.myContent = this.contentPosition;
629 this._positionCollapser.contentHeight = 40;
630 this._positionCollapser.isLabelClickable = true;
631 this._positionCollapser.element = this.contentPosition;
632 this._positionCollapser.isCollapsed = this.isPositionCollapsed;
633 this._positionCollapser.isAnimated = true;
634 Object.defineBinding(this._positionCollapser, "isToggling", {
635 boundObject: this,
636 boundObjectPropertyPath: "isPositionCollapsed",
637 oneway: false
638 });
639
640
641 /*
642 this._positionCollapser.labelClickEvent = function () {
643 that.isPositionCollapsed = that._positionCollapser.isCollapsed;
644 };
645 */
646 //this._positionCollapser.needsDraw = true;
647
648 this._transformCollapser = Collapser.create();
649 this._transformCollapser.clicker = this.labelTransform;
650 this._transformCollapser.myContent = this.contentTransform;
651 this._transformCollapser.contentHeight = 100;
652 this._transformCollapser.isLabelClickable = false;
653 this._transformCollapser.element = this.contentTransform;
654 this._transformCollapser.isCollapsed = this.isTransformCollapsed;
655 this._transformCollapser.isAnimated = true;
656 Object.defineBinding(this._transformCollapser, "isToggling", {
657 boundObject: this,
658 boundObjectPropertyPath: "isTransformCollapsed",
659 oneway: false
660 });
661
662
663 /*
664 this._transformCollapser.labelClickEvent = function () {
665 that.isTransformCollapsed = that._transformCollapser.isCollapsed;
666 };
667 */
668 //this._transformCollapser.needsDraw = true;
669
670 this._styleCollapser = Collapser.create();
671 this._styleCollapser.clicker = this.labelStyles;
672 this._styleCollapser.myContent = this.contentStyles;
673 this._styleCollapser.contentHeight = 0;
674 this._styleCollapser.isLabelClickable = false;
675 this._styleCollapser.element = this.contentStyles;
676 this._styleCollapser.isCollapsed = this.isStyleCollapsed;
677 this._styleCollapser.isAnimated = true;
678 Object.defineBinding(this._styleCollapser, "isToggling", {
679 boundObject: this,
680 boundObjectPropertyPath: "isStyleCollapsed",
681 oneway: false
682 });
683
684
685 /*
686 this._styleCollapser.labelClickEvent = function () {
687 that.isStyleCollapsed = that._styleCollapser.isCollapsed;
688 };
689 */
690 //this._styleCollapser.needsDraw = true;
691 585
692 // Register event handler for layer events. 586 // Register event handler for layer events.
693 //defaultEventManager.addEventListener("layerEvent", this, false); 587 //defaultEventManager.addEventListener("layerEvent", this, false);