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/searchfield.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/searchfield.json')
-rw-r--r-- | node_modules/components-data/searchfield.json | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/node_modules/components-data/searchfield.json b/node_modules/components-data/searchfield.json new file mode 100644 index 00000000..94c570d9 --- /dev/null +++ b/node_modules/components-data/searchfield.json | |||
@@ -0,0 +1,20 @@ | |||
1 | { | ||
2 | "component": "searchfield", | ||
3 | |||
4 | "module": "montage/ui/textfield.reel", | ||
5 | |||
6 | "name": "Textfield", | ||
7 | |||
8 | "properties": [ | ||
9 | { | ||
10 | "name": "valueBinding", | ||
11 | "type": "string", | ||
12 | "default": null | ||
13 | }, | ||
14 | { | ||
15 | "name": "value", | ||
16 | "type": "string", | ||
17 | "default": "" | ||
18 | } | ||
19 | ] | ||
20 | } \ No newline at end of file | ||