diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /node_modules | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'node_modules')
61 files changed, 4376 insertions, 1074 deletions
diff --git a/node_modules/components-data/anchor.json b/node_modules/components-data/anchor.json new file mode 100644 index 00000000..04faf04d --- /dev/null +++ b/node_modules/components-data/anchor.json | |||
| @@ -0,0 +1,46 @@ | |||
| 1 | { | ||
| 2 | "component": "anchor", | ||
| 3 | |||
| 4 | "module": "montage/ui/anchor.reel", | ||
| 5 | |||
| 6 | "name": "Anchor", | ||
| 7 | |||
| 8 | "properties": [ | ||
| 9 | |||
| 10 | { | ||
| 11 | "name": "textContent", | ||
| 12 | "type": "string", | ||
| 13 | "default": "" | ||
| 14 | }, | ||
| 15 | { | ||
| 16 | "name": "href", | ||
| 17 | "type": "string", | ||
| 18 | "default": "" | ||
| 19 | }, | ||
| 20 | { | ||
| 21 | "name": "hreflang", | ||
| 22 | "type": "string", | ||
| 23 | "default": "" | ||
| 24 | }, | ||
| 25 | { | ||
| 26 | "name": "media", | ||
| 27 | "type": "string", | ||
| 28 | "default": "" | ||
| 29 | }, | ||
| 30 | { | ||
| 31 | "name": "rel", | ||
| 32 | "type": "string", | ||
| 33 | "default": "" | ||
| 34 | }, | ||
| 35 | { | ||
| 36 | "name": "target", | ||
| 37 | "type": "string", | ||
| 38 | "default": "" | ||
| 39 | }, | ||
| 40 | { | ||
| 41 | "name": "type", | ||
| 42 | "type": "string", | ||
| 43 | "default": "" | ||
| 44 | } | ||
| 45 | ] | ||
| 46 | } \ No newline at end of file | ||
diff --git a/node_modules/components-data/button.json b/node_modules/components-data/button.json new file mode 100644 index 00000000..3f30030e --- /dev/null +++ b/node_modules/components-data/button.json | |||
| @@ -0,0 +1,72 @@ | |||
| 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": "autofocus", | ||
| 17 | "type": "boolean", | ||
| 18 | "default": "false" | ||
| 19 | }, | ||
| 20 | { | ||
| 21 | "name": "enabled", | ||
| 22 | "type": "boolean", | ||
| 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": "" | ||
| 70 | } | ||
| 71 | ] | ||
| 72 | } \ No newline at end of file | ||
diff --git a/node_modules/components-data/checkbox.json b/node_modules/components-data/checkbox.json new file mode 100644 index 00000000..a03ee00f --- /dev/null +++ b/node_modules/components-data/checkbox.json | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | { | ||
| 2 | "component": "checkbox", | ||
| 3 | |||
| 4 | "module": "montage/ui/checkbox.reel", | ||
| 5 | |||
| 6 | "name": "Checkbox", | ||