aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-15 00:01:28 -0800
committerValerio Virgillito2012-02-15 00:01:28 -0800
commitd1bc0d3e8b3ab3341105c3e29dd2ca11a20d8931 (patch)
tree5f8d34d3782f0c2eaaa1c06e1b90da7b9ccaf333
parent68f8788c80d7f8d7815aca65ffabaa40b9434705 (diff)
downloadninja-d1bc0d3e8b3ab3341105c3e29dd2ca11a20d8931.tar.gz
Adding the button and the dropdown control.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rw-r--r--js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js3
-rw-r--r--node_modules/components-data/button.json51
2 files changed, 54 insertions, 0 deletions
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index 4a0ac2b5..987cd6b5 100644
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -164,6 +164,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
164 row.prop = props.name; 164 row.prop = props.name;
165 row.defaultValue = props["default"]; 165 row.defaultValue = props["default"];
166 row.label = props.name; 166 row.label = props.name;
167 row.items = props.possibleValues;
167 168
168 section.Section.push([row]); 169 section.Section.push([row]);
169 } 170 }
@@ -192,6 +193,8 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
192 return "textbox"; 193 return "textbox";
193 case "boolean": 194 case "boolean":
194 return "checkbox"; 195 return "checkbox";
196 case "select":
197 return "dropdown";
195 default: 198 default:
196 alert("Conversion not implemented for ", type); 199 alert("Conversion not implemented for ", type);
197 } 200 }
diff --git a/node_modules/components-data/button.json b/node_modules/components-data/button.json
index a931afcb..3f30030e 100644
--- a/node_modules/components-data/button.json
+++ b/node_modules/components-data/button.json
@@ -13,9 +13,60 @@
13 "default": "Button" 13 "default": "Button"
14 }, 14 },
15 { 15 {
16 "name": "autofocus",
17 "type": "boolean",
18 "default": "false"
19 },
20 {
16 "name": "enabled", 21 "name": "enabled",
17 "type": "boolean", 22 "type": "boolean",
18 "default": "true" 23 "default": "true"
24 },
25 {
26 "name": "form",
27 "type": "string",
28 "default": ""
29 },
30 {
31 "name": "formaction",
32 "type": "string",
33 "default": ""
34 },
35 {
36 "name": "formenctype",
37 "type": "string",
38 "default": ""
39 },
40 {
41 "name": "formmethod",
42 "type": "string",
43 "default": ""
44 },
45 {
46 "name": "formnovalidate",
47 "type": "boolean",
48 "default": ""
49 },
50 {
51 "name": "formtarget",
52 "type": "string",
53 "default": ""
54 },
55 {
56 "name": "name",
57 "type": "string",
58 "default": ""
59 },
60 {
61 "name": "type",
62 "type": "select",
63 "default": "submit",
64 "possibleValues": ["submit", "reset", "button"]
65 },
66 {
67 "name": "value",
68 "type": "string",
69 "default": ""
19 } 70 }
20 ] 71 ]
21} \ No newline at end of file 72} \ No newline at end of file