Merge branch 'master' of github.com:airbnb/lottie-web
diff --git a/docs/json/animation.json b/docs/json/animation.json
index 530ee84..faa7b93 100644
--- a/docs/json/animation.json
+++ b/docs/json/animation.json
@@ -25,8 +25,9 @@
"ddd": {
"title": "3-D",
"description": "Composition has 3-D layers",
- "enum": [0, 1],
- "type": "number"
+ "type": "number",
+ "$ref": "#/helpers/boolean",
+ "default": 0
},
"h": {
"title": "Height",
@@ -91,11 +92,7 @@
"title": "Chars",
"description": "source chars for text layers",
"items": {
- "oneOf": [
- {
- "$ref": "#/sources/chars"
- }
- ],
+ "$ref": "#/sources/chars",
"type": "object"
},
"type": "array"
diff --git a/docs/json/effects/group.json b/docs/json/effects/group.json
index 80170fb..3336806 100644
--- a/docs/json/effects/group.json
+++ b/docs/json/effects/group.json
@@ -27,11 +27,7 @@
"title": "Effects",
"description": "Effect List of properties.",
"items": {
- "oneOf": [
- {
- "$ref": "#/effects/index"
- }
- ],
+ "$ref": "#/effects/index",
"type": "object"
},
"type": "array"
diff --git a/docs/json/effects/layer.json b/docs/json/effects/layer.json
index 238d4e9..edc5851 100644
--- a/docs/json/effects/layer.json
+++ b/docs/json/effects/layer.json
@@ -26,11 +26,7 @@
"v": {
"title": "Value",
"description": "Effect value.",
- "oneOf": [
- {
- "$ref": "#/properties/value"
- }
- ],
+ "$ref": "#/properties/value",
"type": "object"
}
}
diff --git a/docs/json/helpers/mask.json b/docs/json/helpers/mask.json
index d2c9bea..a94c30b 100644
--- a/docs/json/helpers/mask.json
+++ b/docs/json/helpers/mask.json
@@ -74,7 +74,7 @@
"const": "f"
}
],
- "default": "a",
+ "default": "a"
}
}
}
diff --git a/docs/json/helpers/transform.json b/docs/json/helpers/transform.json
index be60227..791ff36 100644
--- a/docs/json/helpers/transform.json
+++ b/docs/json/helpers/transform.json
@@ -11,7 +11,7 @@
},
{
"$ref": "#/properties/multiDimensionalKeyframed"
- },
+ }
],
"default": {"a":0, "k":[0, 0, 0]},
"type": "object"
diff --git a/docs/json/layers/image.json b/docs/json/layers/image.json
index 66e65f1..c693779 100644
--- a/docs/json/layers/image.json
+++ b/docs/json/layers/image.json
@@ -11,44 +11,28 @@
"ks": {
"title": "Transform",
"description": "Transform properties",
- "oneOf": [
- {
- "$ref": "#/helpers/transform"
- }
- ],
+ "$ref": "#/helpers/transform",
"type": "object"
},
"ao": {
"title": "Auto-Orient",
"description": "Auto-Orient along path AE property.",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"default": 0
},
"bm": {
"title": "Blend Mode",
"description": "Blend Mode",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/blendMode"
- }
- ],
+ "$ref": "#/helpers/blendMode",
"default": 0
},
"ddd": {
"title": "3d Layer",
"description": "3d layer flag",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"default": 0
},
"ind": {
@@ -95,11 +79,7 @@
"title": "Masks Properties",
"description": "List of Masks",
"items": {
- "oneOf": [
- {
- "$ref": "#/helpers/mask"
- }
- ],
+ "$ref": "#/helpers/mask",
"type": "object"
},
"type": "array"
@@ -108,11 +88,7 @@
"title": "Effects",
"description": "List of Effects",
"items": {
- "oneOf": [
- {
- "$ref": "#/effects/index"
- }
- ],
+ "$ref": "#/effects/index",
"type": "object"
},
"type": "array"
diff --git a/docs/json/layers/null.json b/docs/json/layers/null.json
index 7a1f5b6..30bffb1 100644
--- a/docs/json/layers/null.json
+++ b/docs/json/layers/null.json
@@ -11,33 +11,21 @@
"ks": {
"title": "Transform",
"description": "Transform properties",
- "oneOf": [
- {
- "$ref": "#/helpers/transform"
- }
- ],
+ "$ref": "#/helpers/transform",
"type": "object"
},
"ao": {
"title": "Auto-Orient",
"description": "Auto-Orient along path AE property.",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"default": 0
},
"ddd": {
"title": "3d Layer",
"description": "3d layer flag",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"default": 0
},
"ind": {
@@ -79,11 +67,7 @@
"title": "Effects",
"description": "List of Effects",
"items": {
- "oneOf": [
- {
- "$ref": "#/effects/index"
- }
- ],
+ "$ref": "#/effects/index",
"type": "object"
},
"type": "array"
diff --git a/docs/json/layers/preComp.json b/docs/json/layers/preComp.json
index 4fcfa52..9f7447b 100644
--- a/docs/json/layers/preComp.json
+++ b/docs/json/layers/preComp.json
@@ -11,43 +11,27 @@
"ks": {
"title": "Transform",
"description": "Transform properties",
- "oneOf": [
- {
- "$ref": "#/helpers/transform"
- }
- ],
+ "$ref": "#/helpers/transform",
"type": "object"
},
"ao": {
"title": "Auto-Orient",
"description": "Auto-Orient along path AE property.",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ]
+ "$ref": "#/helpers/boolean"
},
"bm": {
"title": "Blend Mode",
"description": "Blend Mode",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/blendMode"
- }
- ],
+ "$ref": "#/helpers/blendMode",
"default": 0
},
"ddd": {
"title": "3d Layer",
"description": "3d layer flag",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"default": 0
},
"ind": {
@@ -94,11 +78,7 @@
"title": "Masks Properties",
"description": "List of Masks",
"items": {
- "oneOf": [
- {
- "$ref": "#/helpers/mask"
- }
- ],
+ "$ref": "#/helpers/mask",
"type": "object"
},
"type": "array"
@@ -107,11 +87,7 @@
"title": "Effects",
"description": "List of Effects",
"items": {
- "oneOf": [
- {
- "$ref": "#/effects/index"
- }
- ],
+ "$ref": "#/effects/index",
"type": "object"
},
"type": "array"
@@ -136,11 +112,7 @@
"title": "Time Remapping",
"description": "Comp's Time remapping",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/properties/valueKeyframed"
- }
- ]
+ "$ref": "#/properties/valueKeyframed"
}
}
}
diff --git a/docs/json/layers/shape.json b/docs/json/layers/shape.json
index a4de3a9..11984f4 100644
--- a/docs/json/layers/shape.json
+++ b/docs/json/layers/shape.json
@@ -11,43 +11,27 @@
"ks": {
"title": "Transform",
"description": "Transform properties",
- "oneOf": [
- {
- "$ref": "#/helpers/transform"
- }
- ],
+ "$ref": "#/helpers/transform",
"type": "object"
},
"ao": {
"title": "Auto-Orient",
"description": "Auto-Orient along path AE property.",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"type": "number",
"default": 0
},
"bm": {
"title": "Blend Mode",
"description": "Blend Mode",
- "oneOf": [
- {
- "$ref": "#/helpers/blendMode"
- }
- ],
+ "$ref": "#/helpers/blendMode",
"type": "number",
"default": 0
},
"ddd": {
"title": "3d Layer",
"description": "3d layer flag",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"type": "number",
"default": 0
},
@@ -95,11 +79,7 @@
"title": "Masks Properties",
"description": "List of Masks",
"items": {
- "oneOf": [
- {
- "$ref": "#/helpers/mask"
- }
- ],
+ "$ref": "#/helpers/mask",
"type": "object"
},
"type": "array"
@@ -108,11 +88,7 @@
"title": "Effects",
"description": "List of Effects",
"items": {
- "oneOf": [
- {
- "$ref": "#/effects/index"
- }
- ],
+ "$ref": "#/effects/index",
"type": "object"
},
"type": "array"
diff --git a/docs/json/layers/solid.json b/docs/json/layers/solid.json
index 108d4ac..7d8925b 100644
--- a/docs/json/layers/solid.json
+++ b/docs/json/layers/solid.json
@@ -11,32 +11,20 @@
"ks": {
"title": "Transform",
"description": "Transform properties",
- "oneOf": [
- {
- "$ref": "#/helpers/transform"
- }
- ],
+ "$ref": "#/helpers/transform",
"type": "object"
},
"ao": {
"title": "Auto-Orient",
"description": "Auto-Orient along path AE property.",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"default": 0
},
"bm": {
"title": "Blend Mode",
"description": "Blend Mode",
- "oneOf": [
- {
- "$ref": "#/helpers/blendMode"
- }
- ],
+ "$ref": "#/helpers/blendMode",
"type": "number",
"default": 0
},
@@ -44,11 +32,7 @@
"title": "3d Layer",
"description": "3d layer flag",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"default": 0
},
"ind": {
@@ -95,11 +79,7 @@
"title": "Masks Properties",
"description": "List of Masks",
"items": {
- "oneOf": [
- {
- "$ref": "#/helpers/mask"
- }
- ],
+ "$ref": "#/helpers/mask",
"type": "object"
},
"type": "array"
@@ -108,11 +88,7 @@
"title": "Effects",
"description": "Auto-Orient along path AE property.",
"type": "number",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ]
+ "$ref": "#/helpers/boolean"
},
"sr": {
"title": "Stretch",
diff --git a/docs/json/layers/text.json b/docs/json/layers/text.json
index 6198282..5b02aaa 100644
--- a/docs/json/layers/text.json
+++ b/docs/json/layers/text.json
@@ -11,43 +11,27 @@
"ks": {
"title": "Transform",
"description": "Transform properties",
- "oneOf": [
- {
- "$ref": "#/helpers/transform"
- }
- ],
+ "$ref": "#/helpers/transform",
"type": "object"
},
"ao": {
"title": "Auto-Orient",
"description": "Auto-Orient along path AE property.",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"type": "number",
"default": 0
},
"bm": {
"title": "Blend Mode",
"description": "Blend Mode",
- "oneOf": [
- {
- "$ref": "#/helpers/blendMode"
- }
- ],
+ "$ref": "#/helpers/blendMode",
"type": "number",
"default": 0
},
"ddd": {
"title": "3d Layer",
"description": "3d layer flag",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"type": "number",
"default": 0
},
@@ -95,11 +79,7 @@
"title": "Masks Properties",
"description": "List of Masks",
"items": {
- "oneOf": [
- {
- "$ref": "#/helpers/mask"
- }
- ],
+ "$ref": "#/helpers/mask",
"type": "object"
},
"type": "array"
@@ -107,11 +87,7 @@
"ef": {
"title": "Effects",
"description": "Auto-Orient along path AE property.",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"type": "number"
},
"sr": {
@@ -374,31 +350,19 @@
{
"title": "Randomize",
"description": "Selector Randomize Order",
- "oneOf": [
- {
- "$ref": "#/helpers/boolean"
- }
- ],
+ "$ref": "#/helpers/boolean",
"type": "number"
},
{
"title": "Shape",
"description": "Selector Shape",
- "oneOf": [
- {
- "$ref": "#/helpers/textShape"
- }
- ],
+ "$ref": "#/helpers/textShape",
"type": "number"
},
{
"title": "Based On",
"description": "Selector Based On",
- "oneOf": [
- {
- "$ref": "#/helpers/textBased"
- }
- ],
+ "$ref": "#/helpers/textBased",
"type": "number"
},
{
@@ -460,11 +424,7 @@
{
"title": "Anchor Point Grouping",
"description": "Text Anchor Point Grouping",
- "oneOf": [
- {
- "$ref": "#/helpers/textGrouping"
- }
- ],
+ "$ref": "#/helpers/textGrouping",
"type": "number"
},
{
diff --git a/docs/json/shapes/fill.json b/docs/json/shapes/fill.json
index cbb9d31..8d4db25 100644
--- a/docs/json/shapes/fill.json
+++ b/docs/json/shapes/fill.json
@@ -23,7 +23,7 @@
"description": "Fill Opacity",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
diff --git a/docs/json/shapes/gFill.json b/docs/json/shapes/gFill.json
index 4a8893d..a79a948 100644
--- a/docs/json/shapes/gFill.json
+++ b/docs/json/shapes/gFill.json
@@ -23,7 +23,7 @@
"description": "Fill Opacity",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -77,7 +77,7 @@
"description": "Gradient Highlight Length. Only if type is Radial",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -90,7 +90,7 @@
"description": "Highlight Angle. Only if type is Radial",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
diff --git a/docs/json/shapes/gStroke.json b/docs/json/shapes/gStroke.json
index 0f4ef4e..423c44f 100644
--- a/docs/json/shapes/gStroke.json
+++ b/docs/json/shapes/gStroke.json
@@ -23,7 +23,7 @@
"description": "Stroke Opacity",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -77,7 +77,7 @@
"description": "Gradient Highlight Length. Only if type is Radial",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -90,7 +90,7 @@
"description": "Highlight Angle. Only if type is Radial",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -108,7 +108,7 @@
"description": "Gradient Stroke Width",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -119,21 +119,13 @@
"lc": {
"title": "Line Cap",
"description": "Gradient Stroke Line Cap",
- "oneOf": [
- {
- "$ref": "#/helpers/lineCap"
- }
- ],
+ "$ref": "#/helpers/lineCap",
"type": "number"
},
"lj": {
"title": "Line Join",
"description": "Gradient Stroke Line Join",
- "oneOf": [
- {
- "$ref": "#/helpers/lineJoin"
- }
- ],
+ "$ref": "#/helpers/lineJoin",
"type": "number"
},
"ml": {
diff --git a/docs/json/shapes/rect.json b/docs/json/shapes/rect.json
index 1a13199..5e95a3f 100644
--- a/docs/json/shapes/rect.json
+++ b/docs/json/shapes/rect.json
@@ -54,7 +54,7 @@
"description": "Rect's rounded corners",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
diff --git a/docs/json/shapes/repeater.json b/docs/json/shapes/repeater.json
index ae42c5a..eee0404 100644
--- a/docs/json/shapes/repeater.json
+++ b/docs/json/shapes/repeater.json
@@ -23,7 +23,7 @@
"description": "Number of Copies",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -37,7 +37,7 @@
"description": "Offset of Copies",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -49,22 +49,14 @@
"m": {
"title": "Composite",
"description": "Composite of copies",
- "oneOf": [
- {
- "$ref": "#/helpers/composite"
- }
- ],
+ "$ref": "#/helpers/composite",
"type": "number",
"default": 1
},
"tr": {
"title": "Transform",
"description": "Transform values for each repeater copy",
- "oneOf": [
- {
- "$ref": "#/helpers/transform"
- }
- ],
+ "$ref": "#/helpers/transform",
"type": "object"
}
}
diff --git a/docs/json/shapes/round.json b/docs/json/shapes/round.json
index c359c0a..92be40e 100644
--- a/docs/json/shapes/round.json
+++ b/docs/json/shapes/round.json
@@ -23,7 +23,7 @@
"description": "Rounded Corner Radius",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
diff --git a/docs/json/shapes/star.json b/docs/json/shapes/star.json
index c6cb4e2..45b5b83 100644
--- a/docs/json/shapes/star.json
+++ b/docs/json/shapes/star.json
@@ -41,7 +41,7 @@
"description": "Star's inner radius. (Star only)",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -54,7 +54,7 @@
"description": "Star's inner roundness. (Star only)",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -67,7 +67,7 @@
"description": "Star's outer radius.",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -80,7 +80,7 @@
"description": "Star's outer roundness.",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -93,7 +93,7 @@
"description": "Star's rotation.",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -106,7 +106,7 @@
"description": "Star's number of points.",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
diff --git a/docs/json/shapes/stroke.json b/docs/json/shapes/stroke.json
index ac8a7b8..5678580 100644
--- a/docs/json/shapes/stroke.json
+++ b/docs/json/shapes/stroke.json
@@ -21,21 +21,13 @@
"lc": {
"title": "Line Cap",
"description": "Stroke Line Cap",
- "oneOf": [
- {
- "$ref": "#/helpers/lineCap"
- }
- ],
+ "$ref": "#/helpers/lineCap",
"type": "number"
},
"lj": {
"title": "Line Join",
"description": "Stroke Line Join",
- "oneOf": [
- {
- "$ref": "#/helpers/lineJoin"
- }
- ],
+ "$ref": "#/helpers/lineJoin",
"type": "number"
},
"ml": {
@@ -48,7 +40,7 @@
"description": "Stroke Opacity",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -61,7 +53,7 @@
"description": "Stroke Width",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
diff --git a/docs/json/shapes/trim.json b/docs/json/shapes/trim.json
index afc5a35..837d582 100644
--- a/docs/json/shapes/trim.json
+++ b/docs/json/shapes/trim.json
@@ -23,7 +23,7 @@
"description": "Trim Start.",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -36,7 +36,7 @@
"description": "Trim End.",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
@@ -49,7 +49,7 @@
"description": "Trim Offset.",
"oneOf": [
{
- "$ref": "#/properties/Value"
+ "$ref": "#/properties/value"
},
{
"$ref": "#/properties/valueKeyframed"
diff --git a/docs/json/sources/chars.json b/docs/json/sources/chars.json
index 9204490..f669495 100644
--- a/docs/json/sources/chars.json
+++ b/docs/json/sources/chars.json
@@ -43,11 +43,7 @@
{
"title": "keys",
"description": "Character Items Keys",
- "oneOf": [
- {
- "$ref": "#/properties/shape"
- }
- ],
+ "$ref": "#/properties/shape",
"type": "object"
}
],
