Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

1 files changed, 14 insertions, 4 deletions

diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 9c8946c4..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) {
@@ -115,12 +116,15 @@ 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();
                 }
                 
                 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 +193,13 @@ exports.Editable = Montage.create(Component, {
     handleKeydown : {
         value : function(e) {
             var k = e.keyCode;
-            console.log('keyCode:  ' + k);
+        }
+    },
+    
+    handleKeyup : {
+        value : function(e) {
+            // Record change in value
+            this.enteredValue = this._element.firstChild.data;
         }
     },
     ///// Text input has changed values
@@ -204,7 +214,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 +223,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();