Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 22 insertions, 0 deletions

diff --git a/node_modules/montage/ui/text-input.js b/node_modules/montage/ui/text-input.js
index cdd20c78..d707fa69 100644
--- a/node_modules/montage/ui/text-input.js
+++ b/node_modules/montage/ui/text-input.js
@@ -79,6 +79,28 @@ var TextInput = exports.TextInput =  Montage.create(NativeControl, {
         }
     },
 
+    _valueBinding: {
+        value: null
+    },
+
+    valueBinding: {
+        get: function() {
+            return this._valueBinding;
+        },
+        set: function(value) {
+            if (this._valueBinding !== value) {
+                if (this._valueBinding !== null) {
+                    Object.deleteBinding(this, "value");
+                }
+                this._valueBinding = value;
+                if (String.isString(value)) {
+                    Object.defineBinding(this, "value", {boundObject: this.ownerComponent, boundObjectPropertyPath: value});
+
+                }
+            }
+        }
+    },
+
     // set value from user input
     /**
       @private