diff options
author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
tree | 762d98ba8852b858c03760f4b9bef294fae6486c /node_modules/montage/ui/number-input.reel | |
parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/number-input.reel')
-rw-r--r-- | node_modules/montage/ui/number-input.reel/number-input.js | 9 |
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 @@ | |||
5 | </copyright> */ | 5 | </copyright> */ |
6 | var Montage = require("montage").Montage, | 6 | var Montage = require("montage").Montage, |
7 | Component = require("ui/component").Component, | 7 | Component = require("ui/component").Component, |
8 | TextInput = require("ui/text-input").TextInput, | 8 | TextInput = require("ui/text-input").TextInput; |
9 | StandardInputAttributes = require("ui/text-input").StandardInputAttributes; | ||
10 | /** | 9 | /** |
11 | * The Number input | 10 | * The Number input |
12 | */ | 11 | */ |
@@ -14,4 +13,8 @@ var NumberInput = exports.NumberInput = Montage.create(TextInput, { | |||
14 | 13 | ||
15 | }); | 14 | }); |
16 | 15 | ||
17 | NumberInput.addAttributes(StandardInputAttributes); | 16 | NumberInput.addAttributes({ |
17 | max: {dataType: 'number'}, | ||
18 | min: {dataType: 'number'}, | ||
19 | step: null // number or 'any' | ||
20 | }); | ||