diff options
| author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
| commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
| tree | e778f2b9d5d525aa364360d5996536a0a06379bd /node_modules/components-data/textfield.json | |
| parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz | |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
Diffstat (limited to 'node_modules/components-data/textfield.json')
| -rw-r--r-- | node_modules/components-data/textfield.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/node_modules/components-data/textfield.json b/node_modules/components-data/textfield.json index 7164b8b3..39c65eab 100644 --- a/node_modules/components-data/textfield.json +++ b/node_modules/components-data/textfield.json | |||
| @@ -7,6 +7,10 @@ | |||
| 7 | 7 | ||
| 8 | "properties": [ | 8 | "properties": [ |
| 9 | { | 9 | { |
| 10 | "name": "valueBinding", | ||
| 11 | "type": "string", | ||
| 12 | "default": null | ||
| 13 | },{ | ||
| 10 | "name": "accept", | 14 | "name": "accept", |
| 11 | "type": "string", | 15 | "type": "string", |
| 12 | "default": null | 16 | "default": null |