aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
diff options
context:
space:
mode:
authorJon Reid2012-03-06 18:06:40 -0800
committerJon Reid2012-03-06 18:06:40 -0800
commitbcfb704b04587f95a13c474cf0598ba90ec3b371 (patch)
tree522d43f72270b897f7e9a9c86f4bfd1c39847478 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
parent78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3 (diff)
downloadninja-bcfb704b04587f95a13c474cf0598ba90ec3b371.tar.gz
Timeline: Code cleanup. Fix bug with unfound property in serialization.
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js108
1 files changed, 0 insertions, 108 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 92714c07..669dabef 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -582,114 +582,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
582 582
583 this.arrPositionTracks = [0, 1]; 583 this.arrPositionTracks = [0, 1];
584 this.arrTransformTracks = [0, 1, 2, 3, 4]; 584 this.arrTransformTracks = [0, 1, 2, 3, 4];
585 /*
586 this.label = this.element.querySelector(".label-main");
587 this.myContent = this.element.querySelector(".content-main");
588 this.labelPosition = this.element.querySelector(".label-position");
589 this.contentPosition = this.element.querySelector(".content-position");
590 this.labelTransform = this.element.querySelector(".label-transform");
591 this.contentTransform = this.element.querySelector(".content-transform");
592 this.labelStyles = this.element.querySelector(".label-styles");
593 this.contentStyles = this.element.querySelector(".content-styles");
594
595 this._mainCollapser = Collapser.create();
596 this._mainCollapser.clicker = this.label;
597 this._mainCollapser.myContent = this.myContent;
598 this._mainCollapser.contentHeight = 60;
599 this._mainCollapser.isLabelClickable = false;
600 this._mainCollapser.element = this.myContent;
601 this._mainCollapser.isCollapsed = this.isMainCollapsed;
602 this._mainCollapser.isAnimated = true;
603 Object.defineBinding(this._mainCollapser, "isToggling", {
604 boundObject: this,
605 boundObjectPropertyPath: "isMainCollapsed",
606 oneway: false
607 });
608
609
610 Object.defineBinding(this._mainCollapser, "bypassAnimation", {
611 boundObject: this,
612 boundObjectPropertyPath: "animateCollapser",
613 oneway: false,
614 boundValueMutator: function(value) {
615 console.log('mutating')
616 return !value
617 }
618 });
619 */
620 /*
621 this._mainCollapser.labelClickEvent = function () {
622 that.isMainCollapsed = that._mainCollapser.isCollapsed;
623 };
624 */
625 //this._mainCollapser.needsDraw = true;
626/*
627 this._positionCollapser = Collapser.create();
628 this._positionCollapser.clicker = this.labelPosition;
629 this._positionCollapser.myContent = this.contentPosition;
630 this._positionCollapser.contentHeight = 40;
631 this._positionCollapser.isLabelClickable = true;
632 this._positionCollapser.element = this.contentPosition;
633 this._positionCollapser.isCollapsed = this.isPositionCollapsed;
634 this._positionCollapser.isAnimated = true;
635 Object.defineBinding(this._positionCollapser, "isToggling", {
636 boundObject: this,
637 boundObjectPropertyPath: "isPositionCollapsed",
638 oneway: false
639 });
640 */
641
642 /*
643 this._positionCollapser.labelClickEvent = function () {
644 that.isPositionCollapsed = that._positionCollapser.isCollapsed;
645 };
646 */
647 //this._positionCollapser.needsDraw = true;
648/*
649 this._transformCollapser = Collapser.create();
650 this._transformCollapser.clicker = this.labelTransform;
651 this._transformCollapser.myContent = this.contentTransform;
652 this._transformCollapser.contentHeight = 100;
653 this._transformCollapser.isLabelClickable = false;
654 this._transformCollapser.element = this.contentTransform;
655 this._transformCollapser.isCollapsed = this.isTransformCollapsed;
656 this._transformCollapser.isAnimated = true;
657 Object.defineBinding(this._transformCollapser, "isToggling", {
658 boundObject: this,
659 boundObjectPropertyPath: "isTransformCollapsed",
660 oneway: false
661 });
662 */
663
664 /*
665 this._transformCollapser.labelClickEvent = function () {
666 that.isTransformCollapsed = that._transformCollapser.isCollapsed;
667 };
668 */
669 //this._transformCollapser.needsDraw = true;
670
671/*
672 this._styleCollapser = Collapser.create();
673 this._styleCollapser.clicker = this.labelStyles;
674 this._styleCollapser.myContent = this.contentStyles;
675 this._styleCollapser.contentHeight = 0;
676 this._styleCollapser.isLabelClickable = false;
677 this._styleCollapser.element = this.contentStyles;
678 this._styleCollapser.isCollapsed = this.isStyleCollapsed;
679 this._styleCollapser.isAnimated = true;
680 Object.defineBinding(this._styleCollapser, "isToggling", {
681 boundObject: this,
682 boundObjectPropertyPath: "isStyleCollapsed",
683 oneway: false
684 });
685
686 */
687 /*
688 this._styleCollapser.labelClickEvent = function () {
689 that.isStyleCollapsed = that._styleCollapser.isCollapsed;
690 };
691 */
692 //this._styleCollapser.needsDraw = true;
693 585
694 // Register event handler for layer events. 586 // Register event handler for layer events.
695 //defaultEventManager.addEventListener("layerEvent", this, false); 587 //defaultEventManager.addEventListener("layerEvent", this, false);