aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJon Reid2012-03-21 11:37:48 -0700
committerJon Reid2012-03-21 11:37:48 -0700
commit3669eea4bde3518ce080048e9f53d2dd111fd8be (patch)
treed88892df558c080342a754351059c0d4a10beba2 /js/panels/Timeline
parent9d7cd4d067b988a65cdea3059769617487028a22 (diff)
downloadninja-3669eea4bde3518ce080048e9f53d2dd111fd8be.tar.gz
Timeline: Bug fix: style collapsers not staying in synch. Also, removed console.log calls in hintable component.
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js3
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js16
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
3 files changed, 16 insertions, 7 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 9334a0b4..fcdbcd22 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -571,6 +571,8 @@ var Layer = exports.Layer = Montage.create(Component, {
571 newEvent = document.createEvent("CustomEvent"); 571 newEvent = document.createEvent("CustomEvent");
572 572
573 this.isStyleCollapsed = false; 573 this.isStyleCollapsed = false;
574 this.layerData.isStyleCollapsed = false;
575 this.triggerOutgoingBinding();
574 576
575 newEvent.initCustomEvent("layerEvent", false, true); 577 newEvent.initCustomEvent("layerEvent", false, true);
576 newEvent.layerEventLocale = "styles"; 578 newEvent.layerEventLocale = "styles";
@@ -603,6 +605,7 @@ var Layer = exports.Layer = Montage.create(Component, {
603 newEvent.styleSelection = mySelection; 605 newEvent.styleSelection = mySelection;
604 defaultEventManager.dispatchEvent(newEvent); 606 defaultEventManager.dispatchEvent(newEvent);
605 607
608
606 } 609 }
607 }, 610 },
608 deleteStyle : { 611 deleteStyle : {
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 03d06d98..0ba49c44 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -915,11 +915,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
915 this.arrLayers[i].layerData.isSelected = false; 915 this.arrLayers[i].layerData.isSelected = false;
916 } 916 }
917 917
918 if (this.arrLayers[i].layerData.triggerBinding === true) { 918 this.triggerLayerBinding(i);
919 this.arrLayers[i].layerData.triggerBinding = false;
920 } else {
921 this.arrLayers[i].layerData.triggerBinding = true;
922 }
923 } 919 }
924 920
925 this.layerRepetition.selectedIndexes = [layerIndex]; 921 this.layerRepetition.selectedIndexes = [layerIndex];
@@ -1077,6 +1073,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1077 } 1073 }
1078 } 1074 }
1079 }, 1075 },
1076 // Trigger the layer/track data binding
1077 triggerLayerBinding : {
1078 value: function(intIndex) {
1079 if (this.arrLayers[intIndex].layerData.triggerBinding === true) {
1080 this.arrLayers[intIndex].layerData.triggerBinding = false;
1081 } else {
1082 this.arrLayers[intIndex].layerData.triggerBinding = true;
1083 }
1084 }
1085 },
1080 /* === END: Controllers === */ 1086 /* === END: Controllers === */
1081 1087
1082 /* === BEGIN: Logging routines === */ 1088 /* === BEGIN: Logging routines === */
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index e9a2115a..011d991e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -672,8 +672,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
672 } else if (layerEvent.layerEventType === "newStyle") { 672 } else if (layerEvent.layerEventType === "newStyle") {
673 this.arrStyleTracks.push("1"); 673 this.arrStyleTracks.push("1");
674 if (this._styleCollapser.isCollapsed === true) { 674 if (this._styleCollapser.isCollapsed === true) {
675 this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation; 675 //this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation;
676 this._styleCollapser.handleCollapserLabelClick(); 676 //this._styleCollapser.handleCollapserLabelClick();
677 } 677 }
678 } else if (layerEvent.layerEventType === "deleteStyle") { 678 } else if (layerEvent.layerEventType === "deleteStyle") {
679 this.arrStyleTracks.pop(); 679 this.arrStyleTracks.pop();