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

diff --git a/node_modules/montage/ui/native/input-number.reel/input-number.js b/node_modules/montage/ui/native/input-number.reel/input-number.js
new file mode 100644
index 00000000..2fd5a15f
--- /dev/null
+++ b/node_modules/montage/ui/native/input-number.reel/input-number.js
@@ -0,0 +1,48 @@
+/* <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> */
+
+/**
+    @module "montage/ui/input-number.reel"
+    @requires montage/ui/component
+    @requires montage/ui/text-input
+*/
+
+var Montage = require("montage").Montage,
+    Component = require("ui/component").Component,
+    TextInput = require("ui/text-input").TextInput;
+
+/**
+ * Wraps the a &lt;input type="date"> element with binding support for the element's standard attributes.
+   @class module:"montage/ui/input-number.reel".InputNumber
+   @extends module:montage/ui/text-input.TextInput
+ */
+var InputNumber = exports.InputNumber = Montage.create(TextInput, {
+
+});
+
+InputNumber.addAttributes(/** @lends module:"montage/ui/input-number.reel".InputNumber */{
+
+/**
+        The maximum value displayed but the number control.
+        @type {number}
+        @default null
+*/
+    max: {dataType: 'number'},
+
+/**
+        The minimum value displayed but the number control.
+        @type {number}
+        @default null
+*/
+    min: {dataType: 'number'},
+
+/**
+        The amount the number changes with each step.
+        @type {number}
+        @default null
+*/
+    step: null // number or 'any'
+});