From 3669eea4bde3518ce080048e9f53d2dd111fd8be Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Wed, 21 Mar 2012 11:37:48 -0700
Subject: Timeline: Bug fix: style collapsers not staying in synch. Also,
 removed console.log calls in hintable component.

---
 js/components/editable.reel/editable.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js/components/editable.reel')

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, {
                 }
                 
                 if(this.stopOnBlur) {
-                    console.log('adding mousedown event listener');
+                    //console.log('adding mousedown event listener');
                     ///// Simulate blur on editable node by listening to the doc
                     document.addEventListener('mouseup', this, false);
                 }
@@ -189,7 +189,7 @@ exports.Editable = Montage.create(Component, {
     handleKeydown : {
         value : function(e) {
             var k = e.keyCode;
-            console.log('keyCode:  ' + k);
+            //console.log('keyCode:  ' + k);
         }
     },
     ///// Text input has changed values
@@ -204,7 +204,7 @@ exports.Editable = Montage.create(Component, {
     },
     handleMouseup : {
         value : function(e) {
-            console.log('handle mouse down');
+            //console.log('handle mouse down');
             ///// Listen for simulated blur event
             if(this.stopOnBlur && e._event.target !== this._element) {
                 this.blur();
@@ -213,7 +213,7 @@ exports.Editable = Montage.create(Component, {
     },
     handleEvent : {
         value : function(e) {
-            console.log("event type : " + e._event.type);
+            //console.log("event type : " + e._event.type);
             ///// If configured, start on specified event
             if(e._event.type === this.startOnEvent) {
                 this.start();
-- 
cgit v1.2.3


From d343c7b3f482c17176cca3ddb6e7f8753169ad48 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 9 Apr 2012 15:15:59 -0700
Subject: Timeline: Bug fix, IKNINJA 1467, "Timeline: Changing layer names
 should not require hitting "Return" key to commit the change"

---
 js/components/editable.reel/editable.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'js/components/editable.reel')

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, {
                 ///// Save the preEditValue
                 this._preEditValue = this.value;
                 
+                // Initialize enteredValue with current value
+                this.enteredValue = this.value;
+                
                 if(this.selectOnStart) {
                     this.selectAll();
                 }
@@ -189,6 +192,10 @@ exports.Editable = Montage.create(Component, {
     handleKeydown : {
         value : function(e) {
             var k = e.keyCode;
+            
+            // Record change
+            this.enteredValue = this._element.firstChild.data;
+            
             //console.log('keyCode:  ' + k);
         }
     },
-- 
cgit v1.2.3


From 96f78dec0e8ddd9ad975ec8150733f4945ff9095 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 13 Apr 2012 12:03:12 -0700
Subject: Timeline: Bug fix: problem with editing layers missing last letter in
 new value.

---
 js/components/editable.reel/editable.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'js/components/editable.reel')

diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index ca65bc2a..dad93b31 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -38,6 +38,7 @@ exports.Editable = Montage.create(Component, {
         set : function(el) {
             this._element = el;
             this._element.addEventListener('keydown', this, false);
+            this._element.addEventListener('keyup', this, false);
             this._element.addEventListener('input', this, false);
             
             if(this.startOnEvent) {
@@ -192,11 +193,13 @@ exports.Editable = Montage.create(Component, {
     handleKeydown : {
         value : function(e) {
             var k = e.keyCode;
-            
-            // Record change
+        }
+    },
+    
+    handleKeyup : {
+        value : function(e) {
+            // Record change in value
             this.enteredValue = this._element.firstChild.data;
-            
-            //console.log('keyCode:  ' + k);
         }
     },
     ///// Text input has changed values
-- 
cgit v1.2.3