diff options
author | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
commit | cdd36ed6c789886657c967e72ec2dcd49c6c5a76 (patch) | |
tree | b044208c38770c0c4edce03379071dbf2eb29b83 /node_modules/components-data/button.json | |
parent | c7ef6951baff283266df7567e30c8074dda4ad01 (diff) | |
parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
download | ninja-cdd36ed6c789886657c967e72ec2dcd49c6c5a76.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/document/html-document.js
Diffstat (limited to 'node_modules/components-data/button.json')
-rw-r--r-- | node_modules/components-data/button.json | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/node_modules/components-data/button.json b/node_modules/components-data/button.json new file mode 100644 index 00000000..a931afcb --- /dev/null +++ b/node_modules/components-data/button.json | |||
@@ -0,0 +1,21 @@ | |||
1 | { | ||
2 | "component": "button", | ||
3 | |||
4 | "module": "montage/ui/button.reel", | ||
5 | |||
6 | "name": "Button", | ||
7 | |||
8 | "properties": [ | ||
9 | |||
10 | { | ||
11 | "name": "label", | ||
12 | "type": "string", | ||
13 | "default": "Button" | ||
14 | }, | ||
15 | { | ||
16 | "name": "enabled", | ||
17 | "type": "boolean", | ||
18 | "default": "true" | ||
19 | } | ||
20 | ] | ||
21 | } \ No newline at end of file | ||