Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

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

1 files changed, 7 insertions, 0 deletions

diff --git a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js
index 4e2dd82e..b5431891 100644
--- a/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js
+++ b/node_modules/montage/ui/autocomplete/autocomplete.reel/autocomplete.js
@@ -50,6 +50,13 @@ var Autocomplete = exports.Autocomplete = Montage.create(TextInput, {
 
     hasTemplate: {value: true},
 
+    didSetElement: {
+        value: function() {
+            TextInput.didSetElement.call(this);
+            this['class'] = (this['class'] || '') + ' montage-inputText';
+        }
+    },
+
     delegate: {
         value: null
     },