Skip to content

Commit 668b5f8

Browse files
kendo-botkendo-bot
committed
Sync with Kendo UI Professional
1 parent 7c1478b commit 668b5f8

File tree

10 files changed

+441
-86
lines changed

10 files changed

+441
-86
lines changed

‎docs/api/javascript/data/datasource.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,7 +1137,7 @@ The field from the server response which contains server-side errors. Can be set
11371137
var dataSource = new kendo.data.DataSource({
11381138
transport: {
11391139
read: {
1140-
url: "https://www.mocky.io/v2/5ad0597a3100004f004eac46",
1140+
url: "https://run.mocky.io/v3/ef00571f-cd9c-4bb3-a8fc-c98afa9e8de4",
11411141
}
11421142
},
11431143
schema: {
@@ -1162,9 +1162,8 @@ The field from the server response which contains server-side errors. Can be set
11621162
var dataSource = new kendo.data.DataSource({
11631163
transport: {
11641164
read: {
1165-
url: "https://demos.telerik.com/kendo-ui/service/twitter/search",
1166-
dataType: "jsonp", // "jsonp" is required for cross-domain requests; use "json" for same-domain requests
1167-
data: { q: "aaaaa" }
1165+
url: "https://run.mocky.io/v3/c9fb4321-bb6f-4f8c-a379-7499329586ed",
1166+
dataType: "jsonp", // "jsonp" is required for cross-domain requests; use "json" for same-domain requests
11681167
}
11691168
},
11701169
schema: {

‎docs/api/javascript/data/pivotdatasourcev2.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ The function that is used to aggregate the measure value.
393393

394394
The built-in aggregates are:
395395
* `average`
396+
* `count`
396397
* `max`
397398
* `min`
398399
* `sum`
@@ -418,7 +419,8 @@ The built-in aggregates are:
418419
}
419420
}
420421
}
421-
});
422+
}
423+
});
422424

423425
dataSource.fetch(function() {
424426
/* The result can be observed in the DevTools(F12) console of the browser. */
@@ -642,7 +644,8 @@ The options of the discover request.
642644
catalogName: dataSource.catalog(),
643645
cubeName: dataSource.cube()
644646
}
645-
});
647+
}
648+
});
646649
</script>
647650

648651
### measures

‎docs/api/javascript/dataviz/ui/chart.md‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14868,6 +14868,110 @@ The width of the line.
1486814868
});
1486914869
</script>
1487014870

14871+
### series.highlight.markers.border
14872+
14873+
The border of the highlighted markers.
14874+
14875+
```dojo
14876+
<div id="chart"></div>
14877+
<script>
14878+
$("#chart").kendoChart({
14879+
series: [{
14880+
type: "line",
14881+
markers: {
14882+
visible: true,
14883+
type: "roundedRect",
14884+
},
14885+
highlight: {
14886+
border: {
14887+
color: 'blue',
14888+
width: 10
14889+
}
14890+
},
14891+
data: [1, 2, 3]
14892+
}]
14893+
});
14894+
</script>
14895+
```
14896+
14897+
### series.highlight.markers.border.color
14898+
14899+
The border color of the highlighted markers.
14900+
14901+
```dojo
14902+
<div id="chart"></div>
14903+
<script>
14904+
$("#chart").kendoChart({
14905+
series: [{
14906+
type: "line",
14907+
markers: {
14908+
visible: true,
14909+
type: "roundedRect",
14910+
},
14911+
highlight: {
14912+
border: {
14913+
color: 'blue',
14914+
width: 10
14915+
}
14916+
},
14917+
data: [1, 2, 3]
14918+
}]
14919+
});
14920+
</script>
14921+
```
14922+
14923+
### series.highlight.markers.border.width
14924+
14925+
The border width of the highlighted markers.
14926+
14927+
```dojo
14928+
<div id="chart"></div>
14929+
<script>
14930+
$("#chart").kendoChart({
14931+
series: [{
14932+
type: "line",
14933+
markers: {
14934+
visible: true,
14935+
type: "roundedRect",
14936+
},
14937+
highlight: {
14938+
border: {
14939+
color: 'blue',
14940+
width: 10
14941+
}
14942+
},
14943+
data: [1, 2, 3]
14944+
}]
14945+
});
14946+
</script>
14947+
```
14948+
14949+
### series.highlight.markers.color
14950+
14951+
The color of the highlighted marker.
14952+
14953+
```dojo
14954+
<div id="chart"></div>
14955+
<script>
14956+
$("#chart").kendoChart({
14957+
series: [{
14958+
type: "line",
14959+
markers: {
14960+
visible: true,
14961+
type: "roundedRect",
14962+
},
14963+
highlight: {
14964+
markers:{
14965+
color: 'red'
14966+
}
14967+
},
14968+
data: [1, 2, 3]
14969+
}]
14970+
});
14971+
</script>
14972+
```
14973+
14974+
1487114975
### series.highlight.opacity `Number`
1487214976

1487314977
The opacity of the highlighted points.

‎docs/api/javascript/ui/pivotgrid.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,7 +1155,7 @@ About the data item structure review this [help topic](/api/javascript/data/pivo
11551155
dataSource: {
11561156
type: "xmla",
11571157
columns: [{ name: "[Date].[Calendar]", expand: true } ],
1158-
measures: ["[Measures].[Internet Revenue Status]"],
1158+
measures: [{ name: "[Measures].[Internet Revenue Status]", type: "status"}],
11591159
transport: {
11601160
connection: {
11611161
catalog: "Adventure Works DW 2008R2",
@@ -1207,7 +1207,7 @@ About the data item structure review this [help topic](/api/javascript/data/pivo
12071207
dataSource: {
12081208
type: "xmla",
12091209
columns: [{ name: "[Date].[Calendar]", expand: true } ],
1210-
measures: ["[Measures].[Internet Revenue Trend]"],
1210+
measures: [{ name: "[Measures].[Internet Revenue Trend]", type: "trend"}],
12111211
transport: {
12121212
connection: {
12131213
catalog: "Adventure Works DW 2008R2",

‎docs/api/javascript/ui/pivotgridv2.md‎

Lines changed: 45 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -860,31 +860,33 @@ The fields which can be used in the template are:
860860
#### Example - specify a custom template for the KPI Status measure
861861

862862
<div id="pivotgrid"></div>
863-
863+
864864
<script>
865-
$("#pivotgrid").kendoPivotGridV2({
866-
kpiStatusTemplate:({ dataItem }) => `${dataItem.value !== 0 ? "<em>Open/Denied</em>" : "<strong>Hold</strong>"}`,
867-
dataSource: {
868-
type: "xmla",
869-
columns: [{ name: "[Date].[Calendar]", expand: true } ],
870-
measures: ["[Measures].[Internet Revenue Status]"],
871-
transport: {
872-
connection: {
873-
catalog: "Adventure Works DW 2008R2",
874-
cube: "Adventure Works"
865+
$("#pivotgrid").kendoPivotGridV2({
866+
kpiStatusTemplate:({ dataItem }) => `${dataItem.value !== 0 ? "<em>Open/Denied</em>" : "<strong>Hold</strong>"}`,
867+
dataSource: {
868+
type: "xmla",
869+
columns: [{ name: "[Date].[Calendar]", expand: true } ],
870+
rows: [{ name: "[Geography].[City]" }],
871+
measures: [{ name: "[Measures].[Internet Revenue Status]", type: "status"}],
872+
transport: {
873+
connection: {
874+
catalog: "Adventure Works DW 2008R2",
875+
cube: "Adventure Works"
876+
},
877+
read: {
878+
url: "https://demos.telerik.com/olap/msmdpump.dll",
879+
dataType: "text",
880+
contentType: "text/xml",
881+
type: "POST"
882+
}
875883
},
876-
read: {
877-
url: "https://demos.telerik.com/olap/msmdpump.dll",
878-
dataType: "text",
879-
contentType: "text/xml",
880-
type: "POST"
884+
schema: {
885+
type: "xmla"
881886
}
882-
},
883-
schema: {
884-
type: "xmla"
885887
}
886-
}
887-
});
888+
});
889+
888890
</script>
889891

890892
### kpiTrendTemplate `String|Function`
@@ -901,31 +903,32 @@ The fields which can be used in the template are:
901903
#### Example - specify a custom template for the KPI Trend measure
902904

903905
<div id="pivotgrid"></div>
904-
906+
905907
<script>
906-
$("#pivotgrid").kendoPivotGridV2({
907-
kpiTrendTemplate: ({ dataItem }) => `${dataItem.value !== 0 ? "<em>Increase/Decrease</em>" : "<strong>Equal</strong>"}`,
908-
dataSource: {
909-
type: "xmla",
910-
columns: [{ name: "[Date].[Calendar]", expand: true } ],
911-
measures: ["[Measures].[Internet Revenue Trend]"],
912-
transport: {
913-
connection: {
914-
catalog: "Adventure Works DW 2008R2",
915-
cube: "Adventure Works"
908+
$("#pivotgrid").kendoPivotGridV2({
909+
kpiTrendTemplate: ({ dataItem }) => `${dataItem.value !== 0 ? "<em>Increase/Decrease</em>" : "<strong>Equal</strong>"}`,
910+
dataSource: {
911+
type: "xmla",
912+
columns: [{ name: "[Date].[Calendar]", expand: true } ],
913+
rows: [{ name: "[Geography].[City]" }],
914+
measures: [{ name: "[Measures].[Internet Revenue Trend]", type: "trend"}],
915+
transport: {
916+
connection: {
917+
catalog: "Adventure Works DW 2008R2",
918+
cube: "Adventure Works"
919+
},
920+
read: {
921+
url: "https://demos.telerik.com/olap/msmdpump.dll",
922+
dataType: "text",
923+
contentType: "text/xml",
924+
type: "POST"
925+
}
916926
},
917-
read: {
918-
url: "https://demos.telerik.com/olap/msmdpump.dll",
919-
dataType: "text",
920-
contentType: "text/xml",
921-
type: "POST"
927+
schema: {
928+
type: "xmla"
922929
}
923-
},
924-
schema: {
925-
type: "xmla"
926930
}
927-
}
928-
});
931+
});
929932
</script>
930933

931934
### rowHeaderTemplate `String|Function`

0 commit comments

Comments
 (0)