Skip to content

Commit f2b6c33

Browse files
committed
Sync with Kendo UI Professional
1 parent cf1ece5 commit f2b6c33

38 files changed

+1195
-894
lines changed

docs/api/javascript/data/datasource.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,24 +1159,24 @@ The field from the server response which contains server-side errors. Can be set
11591159
#### Example - specify the error field as a function
11601160

11611161
<script>
1162-
var dataSource = new kendo.data.DataSource({
1163-
transport: {
1164-
read: {
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
1167-
}
1168-
},
1169-
schema: {
1170-
errors: function(response) {
1171-
return response.error;
1162+
var dataSource = new kendo.data.DataSource({
1163+
transport: {
1164+
read: {
1165+
url: "https://run.mocky.io/v3/b4361129-3100-44e3-8d99-16e65d7446a4",
1166+
dataType: "jsonp", // "jsonp" is required for cross-domain requests; use "json" for same-domain requests
1167+
}
1168+
},
1169+
schema: {
1170+
errors: function(response) {
1171+
return response.error;
1172+
}
1173+
},
1174+
error: function(e) {
1175+
/* The result can be observed in the DevTools(F12) console of the browser. */
1176+
console.log(e.errors);
11721177
}
1173-
},
1174-
error: function(e) {
1175-
/* The result can be observed in the DevTools(F12) console of the browser. */
1176-
console.log(e.errors);
1177-
}
1178-
});
1179-
dataSource.fetch();
1178+
});
1179+
dataSource.fetch();
11801180
</script>
11811181

11821182
### schema.groups `Function|String`

docs/api/javascript/data/pivotdatasource.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -721,23 +721,24 @@ The last aggregated result of the function for already processed records.
721721
"Average": {
722722
field: "UnitPrice",
723723
aggregate: function(value, state, context) {
724-
if (!isNaN(value)) {
725-
state.count = (state.count || 0) + 1;
726-
return (state.accumulator || 0) + value;
727-
} else {
728-
return state.accumulator;
729-
}
724+
if (!isNaN(value)) {
725+
state.count = (state.count || 0) + 1;
726+
return (state.accumulator || 0) + value;
727+
} else {
728+
return state.accumulator;
729+
}
730730
},
731731
result: function(state) {
732-
result state.accumulator / state.count;
732+
return state.accumulator / state.count
733733
}
734+
}
734735
}
735736
}
736737
}
737738
});
738739

739740
dataSource.fetch(function() {
740-
/* The result can be observed in the DevTools(F12) console of the browser. */
741+
/* The result can be observed in the DevTools(F12) console of the browser. */
741742
console.log(dataSource.data(), dataSource.axes());
742743
});
743744
</script>

docs/api/javascript/dataviz/ui/barcode.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ If set to false the barcode will not display the value as a text below the barco
308308
value:"123456",
309309
text:{
310310
visible: false
311-
}
311+
},
312+
height:200
312313
});
313314
</script>
314315

docs/api/javascript/dataviz/ui/stock-chart.md

Lines changed: 83 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,7 +1039,7 @@ without loading them at once.
10391039
navigator: {
10401040
dataSource: {
10411041
transport: {
1042-
read: "/stock/volume"
1042+
//read: "/stock/volume"
10431043
}
10441044
}
10451045
}
@@ -1062,8 +1062,8 @@ Applicable only when using a dedicated navigator data source.
10621062
}
10631063
});
10641064

1065-
// ...
1066-
naviDataSource.read();
1065+
//Call the navigator dataSource's read method
1066+
//naviDataSource.read();
10671067
</script>
10681068

10691069
### navigator.dateField `String`
@@ -1270,8 +1270,7 @@ Omitting the array and specifying a single series is also acceptable.
12701270
type: "line",
12711271
field: "volume"
12721272
}
1273-
},
1274-
...
1273+
}
12751274
});
12761275
</script>
12771276

@@ -1305,23 +1304,36 @@ The following dash types are supported:
13051304

13061305
<div id="stock-chart"></div>
13071306
<script>
1308-
$("#stock-chart").kendoStockChart({
1309-
series: [
1310-
{
1311-
dashType: "dashDot",
1312-
type: "line",
1313-
data: [1, 2, 3]
1314-
}
1315-
],
1316-
categoryAxis: {
1317-
baseUnit: "days",
1318-
categories: [
1319-
new Date(2012, 1, 1),
1320-
new Date(2012, 1, 2),
1321-
new Date(2012, 1, 3)
1322-
]
1323-
}
1324-
});
1307+
$("#stock-chart").kendoStockChart({
1308+
series: [
1309+
{
1310+
dashType: "dashDot",
1311+
type: "line",
1312+
type: "candlestick",
1313+
openField: "Open",
1314+
highField: "High",
1315+
lowField: "Low",
1316+
closeField: "Close",
1317+
data:[{
1318+
"Date": "2016/01/01",
1319+
"Open": 41.62,
1320+
"High": 41.69,
1321+
"Low": 39.81,
1322+
"Close": 40.12,
1323+
"Volume": 2632000
1324+
}, {
1325+
"Date": "2016/03/01",
1326+
"Open": 40.62,
1327+
"High": 39.69,
1328+
"Low": 40.81,
1329+
"Close": 39.12,
1330+
"Volume": 2631986
1331+
}
1332+
]
1333+
}
1334+
],
1335+
dateField: "Date"
1336+
});
13251337
</script>
13261338

13271339

@@ -1363,17 +1375,36 @@ Array of data items. The data item type can be either a:
13631375
<div id="stock-chart"></div>
13641376
<script>
13651377
$("#stock-chart").kendoStockChart({
1366-
series: [
1367-
{
1368-
type: "candlestick",
1369-
data: [2, 4, 1, 3]
1378+
series: [
1379+
{
1380+
type: "candlestick",
1381+
openField: "Open",
1382+
highField: "High",
1383+
lowField: "Low",
1384+
closeField: "Close",
1385+
data:[{
1386+
"Date": "2016/01/01",
1387+
"Open": 41.62,
1388+
"High": 41.69,
1389+
"Low": 39.81,
1390+
"Close": 40.12,
1391+
"Volume": 2632000
1392+
}, {
1393+
"Date": "2016/03/01",
1394+
"Open": 40.62,
1395+
"High": 39.69,
1396+
"Low": 40.81,
1397+
"Close": 39.12,
1398+
"Volume": 2631986
1399+
}
1400+
]
1401+
}
1402+
],
1403+
categoryAxis: {
1404+
categories: [
1405+
new Date(2012, 1, 1)
1406+
]
13701407
}
1371-
],
1372-
categoryAxis: {
1373-
categories: [
1374-
new Date(2012, 1, 1)
1375-
]
1376-
}
13771408
});
13781409
</script>
13791410

@@ -1691,7 +1722,7 @@ The fields which can be used in the template are:
16911722
name: "Value: #: group.value #",
16921723
visibleInLegend: true,
16931724
labels: {
1694-
ariaTemplate: "The value for #= e.series.name # in #= e.category # is #= e.value #",
1725+
ariaTemplate: "The value for #= series.name # in #= category # is #= value #",
16951726
visible: true
16961727
}
16971728
}
@@ -2253,6 +2284,7 @@ If set to `false` the mousewheel will not update the selection.
22532284
}
22542285
}
22552286
});
2287+
</script>
22562288

22572289
#### Example - disable the selection mousewheel behavior
22582290

@@ -2282,6 +2314,7 @@ If set to `false` the mousewheel will not update the selection.
22822314
}
22832315
}
22842316
});
2317+
</script>
22852318

22862319
### navigator.select.mousewheel.reverse `Boolean` *(default: false)*
22872320

@@ -4097,7 +4130,7 @@ The background color of the label. Accepts a valid CSS color string, including h
40974130
data: [1, 2, 3]
40984131
}],
40994132
categoryAxis: {
4100-
notesdata {
4133+
notesdata: {
41014134
data: [{
41024135
value: 1,
41034136
label: {
@@ -5786,7 +5819,7 @@ The author of the PDF document.
57865819

57875820
#### Example - set the author
57885821

5789-
<div id="chart"></div>
5822+
<div id="stock-chart"></div>
57905823
<script>
57915824
$("#stock-chart").kendoStockChart({
57925825
pdf: {
@@ -5838,7 +5871,7 @@ The date when the PDF document is created. Defaults to `new Date()`.
58385871

58395872
#### Example - set the date
58405873

5841-
<div id="chart"></div>
5874+
<div id="stock-chart"></div>
58425875
<script>
58435876
$("#stock-chart").kendoStockChart({
58445877
pdf: {
@@ -5864,7 +5897,7 @@ If set to true, the content will be forwarded to [proxyURL](/api/javascript/data
58645897

58655898
#### Example - use proxy
58665899

5867-
<div id="chart"></div>
5900+
<div id="stock-chart"></div>
58685901
<script>
58695902
$("#stock-chart").kendoStockChart({
58705903
pdf: {
@@ -5891,7 +5924,7 @@ Specifies the file name of the exported PDF file.
58915924

58925925
#### Example - set the default PDF file name
58935926

5894-
<div id="chart"></div>
5927+
<div id="stock-chart"></div>
58955928
<script>
58965929
$("#stock-chart").kendoStockChart({
58975930
pdf: {
@@ -5917,7 +5950,7 @@ Specifies the keywords of the exported PDF file.
59175950

59185951
#### Example - set the keywords
59195952

5920-
<div id="chart"></div>
5953+
<div id="stock-chart"></div>
59215954
<script>
59225955
$("#stock-chart").kendoStockChart({
59235956
pdf: {
@@ -5943,7 +5976,7 @@ Set to `true` to reverse the paper dimensions if needed such that width is the l
59435976

59445977
#### Example - enable landscape mode
59455978

5946-
<div id="chart"></div>
5979+
<div id="stock-chart"></div>
59475980
<script>
59485981
$("#stock-chart").kendoStockChart({
59495982
pdf: {
@@ -5971,7 +6004,7 @@ units are "mm", "cm", "in" and "pt" (default).
59716004

59726005
#### Example - set the margins
59736006

5974-
<div id="chart" style="width: 600px; height: 400px;"></div>
6007+
<div id="stock-chart" style="width: 600px; height: 400px;"></div>
59756008
<script>
59766009
$("#stock-chart").kendoStockChart({
59776010
pdf: {
@@ -6024,7 +6057,7 @@ Supported values:
60246057

60256058
#### Example - set custom paper size
60266059

6027-
<div id="chart"></div>
6060+
<div id="stock-chart"></div>
60286061
<script>
60296062
$("#stock-chart").kendoStockChart({
60306063
pdf: {
@@ -6063,7 +6096,7 @@ The proxy should return the decoded file with set "Content-Disposition" header.
60636096

60646097
#### Example - set the server proxy URL
60656098

6066-
<div id="chart"></div>
6099+
<div id="stock-chart"></div>
60676100
<script>
60686101
$("#stock-chart").kendoStockChart({
60696102
pdf: {
@@ -6093,7 +6126,7 @@ the proxy should set the "Content-Disposition" header to `inline; filename="<fil
60936126

60946127
#### Example - open the generated document in a new window
60956128

6096-
<div id="chart"></div>
6129+
<div id="stock-chart"></div>
60976130
<script>
60986131
$("#stock-chart").kendoStockChart({
60996132
pdf: {
@@ -6121,7 +6154,7 @@ Sets the subject of the PDF file.
61216154

61226155
#### Example - set the subject
61236156

6124-
<div id="chart"></div>
6157+
<div id="stock-chart"></div>
61256158
<script>
61266159
$("#stock-chart").kendoStockChart({
61276160
pdf: {
@@ -6147,7 +6180,7 @@ Sets the title of the PDF file.
61476180

61486181
#### Example - set the title
61496182

6150-
<div id="chart"></div>
6183+
<div id="stock-chart"></div>
61516184
<script>
61526185
$("#stock-chart").kendoStockChart({
61536186
pdf: {
@@ -6952,7 +6985,7 @@ The series base color. The supported values are:
69526985

69536986
#### Example set color as a function
69546987

6955-
<div id="chart"></div>
6988+
<div id="stock-chart"></div>
69566989
<script>
69576990
$("#stock-chart").kendoStockChart({
69586991
dataSource: {
@@ -8316,7 +8349,7 @@ The fields which can be used in the template are:
83168349
seriesDefaults: {
83178350
labels: {
83188351
template: "#= value #%",
8319-
ariaTemplate: "The value for #= e.series.name # on #= e.category # is #= e.value #",
8352+
ariaTemplate: "The value for #= series.name # on #= category # is #= value #",
83208353
visible: true
83218354
}
83228355
},
@@ -9685,8 +9718,7 @@ The border of the title.
96859718
// set the border style to long dashes
96869719
dashType: "longDash"
96879720
}
9688-
},
9689-
...
9721+
}
96909722
});
96919723
```
96929724

@@ -11476,7 +11508,7 @@ The background color of the label. Accepts a valid CSS color string, including h
1147611508
data: [1, 2, 3]
1147711509
}],
1147811510
valueAxis: {
11479-
notesdata {
11511+
notesdata: {
1148011512
data: [{
1148111513
value: 1,
1148211514
label: {

0 commit comments

Comments
 (0)