Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update {token} replacement docs for expressions #5964

Merged
merged 2 commits into from
Jan 8, 2018
Merged

Update {token} replacement docs for expressions #5964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2312c71
Fix docs build
jfirebaugh Jan 8, 2018
5e4c965
Update {token} replacement docs for expressions
jfirebaugh Jan 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/components/expression-metadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ const types = {
};

for (const name in CompoundExpression.definitions) {
if (/^filter-/.test(name)) {
continue;
}
const definition = CompoundExpression.definitions[name];
if (Array.isArray(definition)) {
types[name] = [{
Expand Down
4 changes: 2 additions & 2 deletions src/style-spec/reference/v8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@
"function": "piecewise-constant",
"zoom-function": true,
"property-function": true,
"doc": "Name of image in sprite to use for drawing an image background. A string with `{tokens}` replaced, referencing the data property to pull from. (`{token}` replacement is only supported for literal `icon-image` values; not for property functions.)",
"doc": "Name of image in sprite to use for drawing an image background. Within literal values and zoom functions, property names enclosed in curly brackets (e.g. `{token}`) are replaced with the value of the named property. Expressions and property functions do not support this syntax; for equivalent functionality in expressions, use the [`concat`](#expressions-concat) and [`get`](#expressions-get) operators.",
"tokens": true,
"sdk-support": {
"basic functionality": {
Expand Down Expand Up @@ -1352,7 +1352,7 @@
"property-function": true,
"default": "",
"tokens": true,
"doc": "Value to use for a text label. Feature properties are specified using tokens like `{field_name}`. (`{token}` replacement is only supported for literal `text-field` values; not for property functions.)",
"doc": "Value to use for a text label. Within literal values and zoom functions, property names enclosed in curly brackets (e.g. `{token}`) are replaced with the value of the named property. Expressions and property functions do not support this syntax; for equivalent functionality in expressions, use the [`concat`](#expressions-concat) and [`get`](#expressions-get) operators.",
"sdk-support": {
"basic functionality": {
"js": "0.10.0",
Expand Down