aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/components/editable.reel/editable.js8
-rw-r--r--js/components/hintable.reel/hintable.js12
-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
5 files changed, 26 insertions, 17 deletions
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 9c8946c4..7a31e7fd 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -120,7 +120,7 @@ exports.Editable = Montage.create(Component, {
120 } 120 }
121 121
122 if(this.stopOnBlur) { 122 if(this.stopOnBlur) {
123 console.log('adding mousedown event listener'); 123 //console.log('adding mousedown event listener');
124 ///// Simulate blur on editable node by listening to the doc 124 ///// Simulate blur on editable node by listening to the doc
125 document.addEventListener('mouseup', this, false); 125 document.addEventListener('mouseup', this, false);
126 } 126 }
@@ -189,7 +189,7 @@ exports.Editable = Montage.create(Component, {
189 handleKeydown : { 189 handleKeydown : {
190 value : function(e) { 190 value : function(e) {
191 var k = e.keyCode; 191 var k = e.keyCode;
192 console.log('keyCode: ' + k); 192 //console.log('keyCode: ' + k);
193 } 193 }
194 }, 194 },
195 ///// Text input has changed values 195 ///// Text input has changed values
@@ -204,7 +204,7 @@ exports.Editable = Montage.create(Component, {
204 }, 204 },
205 handleMouseup : { 205 handleMouseup : {
206 value : function(e) { 206 value : function(e) {
207 console.log('handle mouse down'); 207 //console.log('handle mouse down');
208 ///// Listen for simulated blur event 208 ///// Listen for simulated blur event
209 if(this.stopOnBlur && e._event.target !== this._element) { 209 if(this.stopOnBlur && e._event.target !== this._element) {
210 this.blur(); 210 this.blur();
@@ -213,7 +213,7 @@ exports.Editable = Montage.create(Component, {
213 }, 213 },
214 handleEvent : { 214 handleEvent : {
215 value : function(e) { 215 value : function(e) {
216 console.log("event type : " + e._event.type); 216 //console.log("event type : " + e._event.type);
217 ///// If configured, start on specified event 217 ///// If configured, start on specified event
218 if(e._event.type === this.startOnEvent) { 218 if(e._event.type === this.startOnEvent) {
219 this.start(); 219 this.start();
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 5ed46b3c..cbfe2d9b 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -90,10 +90,10 @@ exports.Hintable = Montage.create(Editable, {
90 hintNext : { 90 hintNext : {
91 value : function(e) { 91 value : function(e) {
92 if(e) { e.preventDefault(); } 92 if(e) { e.preventDefault(); }
93 console.log('next1'); 93 //console.log('next1');
94 94
95 if(this._matchIndex < this.matches.length - 1) { 95 if(this._matchIndex < this.matches.length - 1) {
96 console.log('next'); 96 //console.log('next');
97 ++this._matchIndex; 97 ++this._matchIndex;
98 this.hint = this._getHintDifference(); 98 this.hint = this._getHintDifference();
99 } 99 }
@@ -102,9 +102,9 @@ exports.Hintable = Montage.create(Editable, {
102 hintPrev : { 102 hintPrev : {
103 value : function(e) { 103 value : function(e) {
104 if(e) { e.preventDefault(); } 104 if(e) { e.preventDefault(); }
105 console.log('prev1'); 105 //console.log('prev1');
106 if(this._matchIndex !== 0) { 106 if(this._matchIndex !== 0) {
107 console.log('prev'); 107 //console.log('prev');
108 --this._matchIndex; 108 --this._matchIndex;
109 this.hint = this._getHintDifference(); 109 this.hint = this._getHintDifference();
110 } 110 }
@@ -135,7 +135,7 @@ exports.Hintable = Montage.create(Editable, {
135 /// revert to old value 135 /// revert to old value
136 this.value = (this._preEditValue); 136 this.value = (this._preEditValue);
137 this._sendEvent('revert'); 137 this._sendEvent('revert');
138 console.log('reverting'); 138 //console.log('reverting');
139 139
140 } 140 }
141 } 141 }
@@ -180,7 +180,7 @@ exports.Hintable = Montage.create(Editable, {
180 180
181 var val = this.value, 181 var val = this.value,
182 matches, hint; 182 matches, hint;
183 console.log('val = "' + val + '"'); 183 //console.log('val = "' + val + '"');
184 //// Handle auto-suggest if configured 184 //// Handle auto-suggest if configured
185 if(this.hints instanceof Array) { 185 if(this.hints instanceof Array) {
186 186
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();