diff options
| author | hwc487 | 2012-04-19 13:01:43 -0700 |
|---|---|---|
| committer | hwc487 | 2012-04-19 13:01:43 -0700 |
| commit | e6a20fe64574763483dc602bd759278ccf5e5e68 (patch) | |
| tree | 69defe7200206f0257fe90697136fadef59d521e /node_modules | |
| parent | ae7eb87564632ce7c676bd728b8ff2710ff0bb83 (diff) | |
| parent | 9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff) | |
| download | ninja-e6a20fe64574763483dc602bd759278ccf5e5e68.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/drawing/world.js
js/lib/geom/geom-obj.js
js/lib/rdge/materials/cloud-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
Diffstat (limited to 'node_modules')
81 files changed, 7004 insertions, 3024 deletions
diff --git a/node_modules/components-data/anchor.json b/node_modules/components-data/anchor.json index 04faf04d..028a759b 100644 --- a/node_modules/components-data/anchor.json +++ b/node_modules/components-data/anchor.json | |||
| @@ -18,29 +18,10 @@ | |||
| 18 | "default": "" | 18 | "default": "" |
| 19 | }, | 19 | }, |
| 20 | { | 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", | 21 | "name": "target", |
| 37 | "type": "string", | 22 | "type": "select", |
| 38 | "default": "" | 23 | "default": "_self", |
| 39 | }, | 24 | "possibleValues": ["_self", "_blank", "_parent", "_top"] |
| 40 | { | ||
| 41 | "name": "type", | ||
| 42 | "type": "string", | ||
| 43 | "default": "" | ||
| 44 | } | 25 | } |
| 45 | ] | 26 | ] |
| 46 | } \ No newline at end of file | 27 | } \ No newline at end of file |
diff --git a/node_modules/components-data/button.json b/node_modules/components-data/button.json index 3f30030e..a931afcb 100644 --- a/node_modules/components-data/button.json +++ b/node_modules/components-data/button.json | |||
| @@ -13,60 +13,9 @@ | |||
| 13 | "default": "Button" | 13 | "default": "Button" |
| 14 | }, | 14 | }, |
| 15 | { | 15 | { |
| 16 | "name": "autofocus", | ||
| 17 | "type": "boolean", | ||
| 18 | "default": "false" | ||
| 19 | }, | ||
| 20 | { | ||
| 21 | "name": "enabled", | 16 | "name": "enabled", |
| 22 | "type": "boolean", | 17 | "type": "boolean", |
| 23 | "default": "true" | 18 | "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 | |||