Skip to content

Commit

Permalink
update schema and quick fix to make site work
Browse files Browse the repository at this point in the history
  • Loading branch information
sirahd committed Mar 7, 2018
1 parent 8a6c6f0 commit 1685880
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion _data/versions.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
vega: 3.1.0
vega-lite: 2.1.3
vega-embed: 3.0.0
vega-tooltip: 0.5.1
vega-tooltip: 0.6.1

1 change: 1 addition & 0 deletions _includes/docs_toc.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- [Documentation Overview]({{site.baseurl}}/docs/data.html#documentation-overview)
- [Types of Data Sources]({{site.baseurl}}/docs/data.html#types-of-data-sources)
- [Format]({{site.baseurl}}/docs/data.html#format)
- [Datasets]({{site.baseurl}}/docs/data.html#datasets)
- [Projection]({{site.baseurl}}/docs/projection.html)
- [Projection Properties]({{site.baseurl}}/docs/projection.html#properties)
- [Projection Types]({{site.baseurl}}/docs/projection.html#projection-types)
Expand Down
8 changes: 4 additions & 4 deletions build/vega-lite-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -975,7 +975,7 @@
"type": "null"
}
],
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `\"array specifying the preferred order of values\"` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an \"array specifying the preferred order of values\", the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `array specifying the preferred order of values` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an [array specifying the preferred order of values](https://vega.github.io/vega-lite/docs/sort.html#sort-array), the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
},
"test": {
"$ref": "#/definitions/LogicalOperand<Predicate>"
Expand Down Expand Up @@ -1181,7 +1181,7 @@
"type": "null"
}
],
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `\"array specifying the preferred order of values\"` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an \"array specifying the preferred order of values\", the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `array specifying the preferred order of values` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an [array specifying the preferred order of values](https://vega.github.io/vega-lite/docs/sort.html#sort-array), the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
},
"timeUnit": {
"$ref": "#/definitions/TimeUnit",
Expand Down Expand Up @@ -2152,7 +2152,7 @@
"type": "null"
}
],
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `\"array specifying the preferred order of values\"` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an \"array specifying the preferred order of values\", the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `array specifying the preferred order of values` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an [array specifying the preferred order of values](https://vega.github.io/vega-lite/docs/sort.html#sort-array), the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
},
"timeUnit": {
"$ref": "#/definitions/TimeUnit",
Expand Down Expand Up @@ -4259,7 +4259,7 @@
"type": "null"
}
],
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `\"array specifying the preferred order of values\"` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an \"array specifying the preferred order of values\", the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
"description": "Sort order for the encoded field.\nSupported `sort` values include `\"ascending\"`, `\"descending\"`, `array specifying the preferred order of values` and `null` (no sorting).\nFor fields with discrete domains, `sort` can also be a [sort field definition object](https://vega.github.io/vega-lite/docs/sort.html#sort-field).\nFor `sort` as an [array specifying the preferred order of values](https://vega.github.io/vega-lite/docs/sort.html#sort-array), the sort order will obey the values in the array, followed by any unspecified values in their original order.\n\n__Default value:__ `\"ascending\"`"
},
"stack": {
"anyOf": [
Expand Down
2 changes: 1 addition & 1 deletion site/static/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function embedExample($target: any, spec: TopLevelExtendedSpec, actions=true, to
});

if (tooltip) {
vegaLite(view, spec);
vegaLite(view, spec as any);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/sort.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {isArray, isString} from 'vega-util';
import {AggregateOp} from './aggregate';
import {SortField} from './sort';
import {isArray, isString} from './util';


export type SortOrder = 'ascending' | 'descending' | null;
Expand Down

0 comments on commit 1685880

Please sign in to comment.