diff options
author | Ananya Sen | 2012-04-06 12:48:52 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-06 12:48:52 -0700 |
commit | 0f6cee34ae696f72c7bedc23b7aaa0b1e08b5f6b (patch) | |
tree | 02c10700fa61602206fcd9793f4aa04842670bc9 /node_modules/components-data/textarea.json | |
parent | 8acdde3e87f8cabd179a068c54fe5b78fa38e40d (diff) | |
parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
download | ninja-0f6cee34ae696f72c7bedc23b7aaa0b1e08b5f6b.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into bug-fixes
Diffstat (limited to 'node_modules/components-data/textarea.json')
-rw-r--r-- | node_modules/components-data/textarea.json | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/node_modules/components-data/textarea.json b/node_modules/components-data/textarea.json index 6e3d78c2..8e780954 100644 --- a/node_modules/components-data/textarea.json +++ b/node_modules/components-data/textarea.json | |||
@@ -8,25 +8,14 @@ | |||
8 | "properties": [ | 8 | "properties": [ |
9 | 9 | ||
10 | { | 10 | { |
11 | "name": "rows", | ||
12 | "type": "number", | ||
13 | "default": null | ||
14 | }, | ||
15 | { | ||
16 | "name": "cols", | ||
17 | "type": "number", | ||
18 | "default": null | ||
19 | }, | ||
20 | { | ||
21 | "name": "wrap", | ||
22 | "type": "string", | ||
23 | "default": "soft", | ||
24 | "possibleValues": ["hard", "soft"] | ||
25 | }, | ||
26 | { | ||
27 | "name": "textContent", | 11 | "name": "textContent", |
28 | "type": "string", | 12 | "type": "string", |
29 | "default": null | 13 | "default": null |
14 | }, | ||
15 | { | ||
16 | "name": "disabled", | ||
17 | "type": "boolean", | ||
18 | "default": false | ||
30 | } | 19 | } |
31 | ] | 20 | ] |
32 | } \ No newline at end of file | 21 | } \ No newline at end of file |