Skip to content

Commit 1cf287c

Browse files
kendo-botkendo-bot
committed
Sync with Kendo UI Professional
1 parent b005019 commit 1cf287c

File tree

8 files changed

+201
-69
lines changed

8 files changed

+201
-69
lines changed

‎docs-aspnet/installation/system-requirements/export-support.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ JSZip is part of the Kendo UI distribution and is also available through the Ken
4040
<script src="https://kendo.cdn.telerik.com/{{ site.mvcCoreVersion }}/js/jszip.min.js"></script>
4141

4242
> * If you do not include JSZip in the page, Kendo UI will raise a runtime exception.
43-
> * As of the Kendo UI R3 2017 release, the Excel Export feature supports JSZip 2.x and 3.x versions. Kendo UI releases prior to R2 2017 SP1 provided Excel export of JSZip 2.x versions only.
4443
4544
When you use JSZip in scenarios where the packages are loaded from NPM, explicitly assign the JSZip object to a field in the `window` object. To properly load JSZip in the application:
4645

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,20 @@ Sets a value controlling how the color is applied. Can also be set to the follow
193193
});
194194
</script>
195195

196+
### focusTime `Date`*(default: null)*
197+
198+
Specifies a time that will be focused inside the popup when opened.
199+
200+
#### Example - specify a focus time
201+
202+
<input id="timepicker" />
203+
<script>
204+
$("#timepicker").kendoTimePicker({
205+
focusTime: new Date(2023, 10, 4, 8, 0, 0) //date part is ignored
206+
});
207+
</script>
208+
209+
196210
### format `String`*(default: "h:mm tt")*
197211

198212
Specifies the format, which is used to format the value of the TimePicker displayed in the input. The format also will be used to parse the input.

‎docs/controls/grid/row-column-spanning.md

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
---
2+
title: Row and Column Spanning
3+
page_title: jQuery Grid Documentation - Row and Column Spanning
4+
description: "Get started with the jQuery Grid by Kendo UI and learn all about the Row and Column Spanning feature."
5+
slug: row_column_spanning__kendoui_grid
6+
position: 15
7+
---
8+
9+
# Row and Column Spanning
10+
11+
12+
## Row Spanning
13+
14+
The Row spanning functionality of the Grid enables you to span a cell between multiple rows.
15+
You can use the [`attributes`](/api/javascript/ui/grid/configuration/columns.attributes) function and calculate the span of each cell.
16+
17+
```dojo
18+
<div id="grid"></div>
19+
<script type="module">
20+
$("#grid").kendoGrid({
21+
columns: [
22+
"id",
23+
"name",
24+
{
25+
field: "country", width: 800,
26+
attributes: (dataItem) => {
27+
const dataView = dataItem.parent();
28+
let currentIndex = dataView.indexOf(dataItem);
29+
const prevDataItem = currentIndex === 0 ? null : dataView.at(currentIndex - 1);
30+
let nextDataItem = dataView.at(++currentIndex);
31+
let rowSpan = 1;
32+
33+
if (prevDataItem && dataItem['country'] === prevDataItem['country']) {
34+
return {
35+
hidden: 'hidden'
36+
}
37+
}
38+
39+
while (nextDataItem) {
40+
if (dataItem['country'] === nextDataItem['country']) {
41+
rowSpan++;
42+
} else {
43+
break;
44+
}
45+
46+
nextDataItem = dataView.at(++currentIndex);
47+
}
48+
49+
return { rowSpan };
50+
},
51+
template: ({ country }) => {
52+
return `<strong>${kendo.htmlEncode(country)}</strong>`
53+
}
54+
}
55+
],
56+
dataSource: [
57+
{ id: 1, name: "Albert", country: "Belgium" },
58+
{ id: 2, name: "Noah", country: "Belgium" },
59+
{ id: 3, name: "Emma", country: "Belgium" },
60+
{ id: 4, name: "Oscar", country: "Denmark" },
61+
{ id: 5, name: "William", country: "Denmark" },
62+
{ id: 6, name: "Aksel", country: "Germany" },
63+
{ id: 7, name: "Luca", country: "Italy" },
64+
{ id: 8, name: "Michele", country: "Italy" },
65+
{ id: 9, name: "Giuseppe", country: "Italy" },
66+
{ id: 10, name: "Juan Carlos", country: "Spain" },
67+
]
68+
});
69+
</script>
70+
```
71+
72+
## Column Spanning
73+
74+
The Column spanning functionality enables you to span multiple columns in the Grid. This feature is equal to 'cell merging' in Excel or 'column spanning' in HTML tables.
75+
The Column spanning is available through the [`attributes`](/api/javascript/ui/grid/configuration/columns.attributes) function and its `hidden` property.
76+
77+
```
78+
<div id="grid"></div>
79+
<script>
80+
$("#grid").kendoGrid({
81+
columns: [
82+
{ field: "id", width: 100 },
83+
{ field: "name", width: 150 },
84+
{ field: "pass",
85+
width: 100,
86+
attributes: ({ pass }) => {
87+
if (!pass) {
88+
return {
89+
colSpan: 2,
90+
"class": "!k-text-center"
91+
};
92+
}
93+
},
94+
template: "#= !pass ? 'Not passing' : 'Passing' #"
95+
},
96+
{
97+
field: "country",
98+
width: 300,
99+
attributes: ({ pass }) => {
100+
if (!pass) {
101+
return { hidden: "hidden" };
102+
}
103+
}
104+
}
105+
],
106+
dataSource: [
107+
{ id: 1, name: "Albert", country: "Belgium", pass: false },
108+
{ id: 2, name: "Noah", country: "Belgium", pass: true },
109+
{ id: 3, name: "Emma", country: "Belgium", pass: false },
110+
{ id: 4, name: "Oscar", country: "Denmark", pass: false },
111+
{ id: 5, name: "William", country: "Denmark", pass: true },
112+
{ id: 6, name: "Aksel", country: "Germany", pass: true },
113+
{ id: 7, name: "Luca", country: "Italy", pass: true },
114+
{ id: 8, name: "Michele", country: "Italy", pass: true },
115+
{ id: 9, name: "Giuseppe", country: "Italy", pass: false },
116+
{ id: 10, name: "Juan Carlos", country: "Spain", pass: true },
117+
]
118+
});
119+
</script>
120+
```
121+
122+
123+
## See Also
124+
125+
* [Row Spanning in the Kendo UI for jQuery Grid (Demo)](https://demos.telerik.com/kendo-ui/grid/row-spanning)
126+
* [Column Spanning in the Kendo UI for jQuery Grid (Demo)](https://demos.telerik.com/kendo-ui/grid/column-spanning)
127+
* [JavaScript API Reference of the Kendo UI for jQuery Grid](/api/javascript/ui/grid)
128+

‎docs/framework/excel/get-started.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ JSZip is part of the Kendo UI distribution and is also available through the Ken
8080
```
8181

8282
> * If you do not include JSZip in the page, Kendo UI will raise a runtime exception.
83-
> * As of the Kendo UI R3 2017 release, the Excel Export feature supports JSZip 2.* and 3.* versions. Kendo UI releases prior to R2 2017 SP1 provided Excel export only of JSZip 2.* versions.
8483
8584
When you use JSZip in scenarios where the packages are loaded from NPM, explicitly assign the JSZip object to a field in the `window` object. To properly load JSZip in the application:
8685

‎docs/knowledge-base/invalid-license.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Troubleshooting an Invalid Kendo UI License
33
page_title: Troubleshooting an Invalid Kendo UI License
4-
description: "Find out what can cause a banner and a watermark to appear on pages with Kendo UI for jQuery components, and what triggers the message "License activation failed" message in the browser's console."
4+
description: Find out what can cause a banner and a watermark to appear on pages with Kendo UI for jQuery components, and what triggers the message "License activation failed" message in the browser's console.
55
slug: invalid-license
66
type: troubleshooting
77
res_type: kb

‎docs/knowledge-base/multiselect-as-tagbox.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ How can I configure and customize the MultiSelect to behave as a TagBox?
4747
var currentId = 1;
4848
4949
function onDataBound(e) {
50-
$('.k-multiselect .k-input').unbind('keyup');
51-
$('.k-multiselect .k-input').on('keyup', onClickEnter);
50+
$('.k-multiselect .k-input-inner').unbind('keyup');
51+
$('.k-multiselect .k-input-inner').on('keyup', onClickEnter);
5252
}
5353
function onClickEnter(e) {
5454
if (e.keyCode === 13) {
5555
var widget = $('#products').getKendoMultiSelect();
5656
var dataSource = widget.dataSource;
57-
var input = $('.k-multiselect .k-input');
57+
var input = $('.k-multiselect .k-input-inner');
5858
var value = input.val().trim();
5959
if (!value || value.length === 0) {
6060
return;

‎package-lock.json

Lines changed: 49 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"license": "Apache-2.0",
1111
"version": "1.0.0",
1212
"devDependencies": {
13-
"@progress/kendo-svg-icons": "1.9.0",
14-
"@progress/kendo-theme-bootstrap": "6.7.0",
15-
"@progress/kendo-theme-classic": "6.7.0",
16-
"@progress/kendo-theme-default": "6.7.0",
17-
"@progress/kendo-theme-fluent": "6.7.0",
18-
"@progress/kendo-theme-material": "6.7.0",
13+
"@progress/kendo-svg-icons": "2.0.0",
14+
"@progress/kendo-theme-bootstrap": "7.0.1",
15+
"@progress/kendo-theme-classic": "7.0.1",
16+
"@progress/kendo-theme-default": "7.0.1",
17+
"@progress/kendo-theme-fluent": "7.0.1",
18+
"@progress/kendo-theme-material": "7.0.1",
1919
"@progress/wct-a11y-spec": "^2.0.9",
2020
"@rollup/plugin-buble": "^0.21.3",
2121
"@rollup/plugin-node-resolve": "^13.3.0",

0 commit comments

Comments
 (0)