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, 24 insertions, 0 deletions

diff --git a/node_modules/montage/ui/input-text.reel/input-text.js b/node_modules/montage/ui/input-text.reel/input-text.js
new file mode 100644
index 00000000..36769921
--- /dev/null
+++ b/node_modules/montage/ui/input-text.reel/input-text.js
@@ -0,0 +1,24 @@
+/* <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
+/*global require,exports */
+var Montage = require("montage").Montage,
+    Component = require("ui/component").Component,
+    NativeInputText = require("ui/native/input-text.reel").InputText;
+
+/**
+ * Input Text
+ */
+exports.InputText = Montage.create(NativeInputText, {
+
+    hasTemplate: {value: true},
+
+    didSetElement: {
+        value: function() {
+            NativeInputText.didSetElement.call(this);
+            this['class'] = (this['class'] || '') + ' montage-inputText';
+        }
+    }
+});
\ No newline at end of file