aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJonathan Duran2012-04-10 08:16:17 -0700
committerJonathan Duran2012-04-10 08:16:17 -0700
commite0f67d9075f53ef95a9c811c6737cd4f1c9d96da (patch)
tree668a7a9a7ce01e51ec6b896e4626b661555a6955 /js/components
parent58e049b68e03abbacde93206d2666361022c0858 (diff)
parentd343c7b3f482c17176cca3ddb6e7f8753169ad48 (diff)
downloadninja-e0f67d9075f53ef95a9c811c6737cd4f1c9d96da.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/components')
-rw-r--r--js/components/editable.reel/editable.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 7a31e7fd..ca65bc2a 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -115,6 +115,9 @@ exports.Editable = Montage.create(Component, {
115 ///// Save the preEditValue 115 ///// Save the preEditValue
116 this._preEditValue = this.value; 116 this._preEditValue = this.value;
117 117
118 // Initialize enteredValue with current value
119 this.enteredValue = this.value;
120
118 if(this.selectOnStart) { 121 if(this.selectOnStart) {
119 this.selectAll(); 122 this.selectAll();
120 } 123 }
@@ -189,6 +192,10 @@ exports.Editable = Montage.create(Component, {
189 handleKeydown : { 192 handleKeydown : {
190 value : function(e) { 193 value : function(e) {
191 var k = e.keyCode; 194 var k = e.keyCode;
195
196 // Record change
197 this.enteredValue = this._element.firstChild.data;
198
192 //console.log('keyCode: ' + k); 199 //console.log('keyCode: ' + k);
193 } 200 }
194 }, 201 },