Merge branch 'refs/heads/master' into binding

Conflicts:
	js/components/hintable.reel/hintable.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 14 insertions, 1 deletions

diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index d09cdbd2..810f0d65 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -140,6 +140,19 @@ exports.Hintable = Montage.create(Editable, {
             }
         }
     },
+    value : {
+        get: function() {
+            return this._getFirstTextNode().textContent;
+        },
+        set: function(str) {
+            var node = this._getFirstTextNode();
+            if (node.textContent !== str) {
+                node.textContent = str;
+            }
+            
+            //node.innerText = str;
+        }
+    },
 
     handleKeydown : {
         value : function handleKeydown(e) {
@@ -298,4 +311,4 @@ exports.Hintable = Montage.create(Editable, {
         distinct: true
     }
     
-});
\ No newline at end of file
+});