Merge branch 'refs/heads/master' into components

1 files changed, 6 insertions, 3 deletions

diff --git a/node_modules/montage/ui/number-input.reel/number-input.js b/node_modules/montage/ui/number-input.reel/number-input.js
index b5fd0a66..dfd7235f 100644
--- a/node_modules/montage/ui/number-input.reel/number-input.js
+++ b/node_modules/montage/ui/number-input.reel/number-input.js
@@ -5,8 +5,7 @@
  </copyright> */
 var Montage = require("montage").Montage,
     Component = require("ui/component").Component,
-    TextInput = require("ui/text-input").TextInput,
-    StandardInputAttributes = require("ui/text-input").StandardInputAttributes;
+    TextInput = require("ui/text-input").TextInput;
 /**
  * The Number input
  */
@@ -14,4 +13,8 @@ var NumberInput = exports.NumberInput = Montage.create(TextInput, {
 
 });
 
-NumberInput.addAttributes(StandardInputAttributes);
+NumberInput.addAttributes({
+    max: {dataType: 'number'},
+    min: {dataType: 'number'},
+    step: null // number or 'any'
+});