Skip to content

Commit 37e9ee4

Browse files
committed
Sync with Kendo UI Professional
1 parent 3c0a03a commit 37e9ee4

16 files changed

+101
-120
lines changed

docs/controls/grid/globalization/intl.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,10 @@ The following example demonstrates how to allow the user to manually select the
146146
$("#grid").kendoGrid({
147147
dataSource: dataSource,
148148
height: 430,
149-
toolbar: ["create", "save", "cancel"],
149+
toolbar: {
150+
showInactiveTools: true,
151+
items: ["create", "save", "cancel"]
152+
},
150153
editable:true,
151154
pageable: true,
152155
columns:[

docs/controls/grid/toolbar.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,10 @@ In the example below, the `Save Changes` and `Cancel Changes` buttons will be di
134134
<script>
135135
$(document).ready(function () {
136136
$("#grid").kendoGrid({
137-
showInactiveTools: true,
138-
toolbar: ["save", "cancel"],
137+
toolbar: {
138+
showInactiveTools: true,
139+
items: ["save", "cancel"]
140+
},
139141
columns: [{ field: "name" }, { field: "age" }],
140142
dataSource: {
141143
data: [

docs/controls/listview/paging.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ The following example demonstrates the full implementation of the suggested appr
144144
145145
<script>
146146
var dataSource = new kendo.data.DataSource({
147+
pageSize: 10,
147148
transport: {
148149
read: {
149150
url: "https://demos.telerik.com/service/v2/core/Products"

docs/controls/multicolumncombobox/cascading.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ To initialize a cascading MultiColumnComboBox, use the following example.
6666
columns: [
6767
{ field: "ProductID", title: "ID", width: 120 },
6868
{ field: "ProductName", title: "Name", width: 120 },
69-
{ field: "UnitsInStock ", title: "UnitsInStock", width: 120 }
69+
{ field: "UnitsInStock", title: "UnitsInStock", width: 120 }
7070
],
7171
dataSource: {
7272
type: "odata-v4",

docs/knowledge-base/check-listview-item-selected.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ How can I check if a certain value corresponds to a DataItem property of the sel
7373
read: {
7474
url: "https://demos.telerik.com/service/v2/core/Products",
7575
}
76-
}
76+
},
7777
pageSize: 15
7878
});
7979

docs/knowledge-base/create-with-dynamic-columns-and-data-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This article showcases how to dynamically generate the Kendo UI Grid by using th
4747
<script>
4848
var isDateField =[];
4949
$.ajax({
50-
url: "https://run.mocky.io/v3/fe25d379-099c-4e04-b26b-5f0453e43ef4"
50+
url: "https://runner.telerik.io/fullscreen/DEUMgSey.json",
5151
success: function(result) {
5252
generateGrid(result);
5353
}

docs/knowledge-base/font-awesome.md

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,16 @@ res_type: kb
1313
## Environment
1414

1515
<table>
16-
<tr>
17-
<td>Product</td>
18-
<td>Progress® Kendo UI® Drawing API</td>
19-
</tr>
20-
<tr>
21-
<td>Operating System</td>
22-
<td>Windows 10 64bit</td>
23-
</tr>
24-
<tr>
25-
<td>Visual Studio Version</td>
26-
<td>Visual Studio 2017</td>
27-
</tr>
28-
<tr>
29-
<td>Preferred Language</td>
30-
<td>JavaScript</td>
31-
</tr>
16+
<tbody>
17+
<tr>
18+
<td>Product</td>
19+
<td>Kendo UI Grid for jQuery</td>
20+
</tr>
21+
<tr>
22+
<td>Version</td>
23+
<td>2025.2.520</td>
24+
</tr>
25+
</tbody>
3226
</table>
3327

3428
## Description
@@ -41,8 +35,8 @@ Custom fonts, including icon fonts such as [Font Awesome](https://fortawesome.gi
4135

4236
The following example demonstrates how to achieve the desired scenario.
4337

44-
```
45-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.css">
38+
```dojo
39+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.css">
4640
4741
<script>
4842
// The font file location must be set explicitly if it's not hosted in the same domain
@@ -61,14 +55,14 @@ The following example demonstrates how to achieve the desired scenario.
6155
<i class="fa fa-thumbs-down fa-2x"></i>
6256
</td>
6357
<td class="details">
64-
<span class="title">Title: #: Title #</span>
58+
<span class="name">Name: #: FullName #</span>
6559
</td>
66-
<td class="country">
67-
#: Country #
60+
<td class="employees">
61+
#: HasEmployees #
6862
</td>
69-
<td class="employeeID">
70-
#: EmployeeID #
71-
</td>
63+
<td class="employeeId">
64+
#: EmployeeId #
65+
</td>
7266
</tr>
7367
</script>
7468
<script>
@@ -87,9 +81,9 @@ The following example demonstrates how to achieve the desired scenario.
8781
},
8882
columns: [
8983
{ title: "Photo", width: 140 },
90-
{ title: "Details", width: 400 },
91-
{ title: "Country" },
92-
{ title: "EmployeeID" }
84+
{ title: "FullName", width: 400 },
85+
{ title: "HasEmployees" },
86+
{ title: "EmployeeId" }
9387
],
9488
rowTemplate: kendo.template($("#rowTemplate").html()),
9589
scrollable: false

docs/knowledge-base/grid-dynamic-aggregates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ There a different options to choose from when it comes to the UI of the aggregat
5353
var model;
5454
var columns;
5555
$.ajax({
56-
url: "https://www.mocky.io/v2/5835e736110000020e0c003c",
56+
url: "https://runner.telerik.io/fullscreen/DEUMgSey.json",
5757
success: function (result) {
5858
generateGrid(result);
5959
}

docs/knowledge-base/grid-prevent-popup-close-on-validation-errors-from-server.md

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,46 +63,47 @@ I am returning errors from server and catch it in kendo datasource error event.
6363
<div id="grid"></div>
6464
<script>
6565
var dataSource = new kendo.data.DataSource({
66+
pageSize: 15,
6667
transport: {
67-
read:{
68-
url: "https://www.mocky.io/v2/5ce682093300004b3573161e"
68+
read: {
69+
url: "https://runner.telerik.io/fullscreen/PQkmUirI.json",
6970
},
7071
update: {
71-
url: "https://www.mocky.io/v2/5ce686e33300006200731647",
72-
}
72+
url: "https://runner.telerik.io/fullscreen/ojjEoSVp.json",
73+
},
7374
},
7475
schema: {
75-
data: "items",
76-
total:"total",
76+
total: "total",
7777
errors: "errors",
78-
model:{
79-
id: "id",
80-
fields:{
81-
id: { editable: false },
82-
name: { type: "string" }
83-
}
84-
}
78+
model: {
79+
id: "ProductID",
80+
fields: {
81+
ProductID: { editable: false },
82+
ProductName: { type: "string" },
83+
},
84+
},
8585
},
86-
error: function(e) {
86+
error: function (e) {
8787
grid.one("dataBinding", function (ev) {
8888
ev.preventDefault();
89-
var message = "Errors:\n";
90-
$.each(e.errors, function (idx, error) {
91-
message += "Code: "
92-
+ error.code
93-
+ " | Reason: " + error.reason
94-
+ "\n";
89+
var message = "Errors:\n";
90+
$.each(e.errors, function (idx, error) {
91+
debugger;
92+
message +=
93+
"Code: " + error.code + " | Reason: " + error.reason + "\n";
9594
});
9695
kendo.alert(message);
9796
});
98-
}
97+
},
9998
});
10099
101-
var grid = $("#grid").kendoGrid({
102-
dataSource:dataSource,
103-
columns:["id", "name", {command: ["edit"]}],
104-
editable:{ mode : "popup"}
105-
}).data("kendoGrid");
100+
var grid = $("#grid")
101+
.kendoGrid({
102+
dataSource: dataSource,
103+
columns: ["ProductID", "ProductName", { command: ["edit"] }],
104+
editable: { mode: "popup" },
105+
})
106+
.data("kendoGrid");
106107
</script>
107108
```
108109

docs/knowledge-base/grid-remove-trailing-space-resize.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Add an empty column to the Grid. You can manually calculate its width, so that i
5252
5353
function adjustLastColumn() {
5454
var grid = $("#grid1").data("kendoGrid");
55-
var contentDiv = grid.wrapper.children(".k-grid-content");
55+
var contentDiv = grid.wrapper.children().find(".k-grid-content");
5656
var masterHeaderTable = grid.thead.parent();
5757
var masterBodyTable = contentDiv.children("table");
5858
var gridDivWidth = contentDiv.width() - kendo.support.scrollbar();

0 commit comments

Comments
 (0)