Skip to content

Commit 840bdec

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent dadf049 commit 840bdec

File tree

11 files changed

+87
-154
lines changed

11 files changed

+87
-154
lines changed

docs-aspnet/html-helpers/data-management/grid/templates/group-templates.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ Due to the fact that `ClientGroupHeaderTemplate` is displayed next to the expand
6161
![A Grid with GroupHeaderColumnTemplate for first column applied and no GroupHeaderTemplate](../images/grid-group-header-column-template-first-column.png)
6262

6363
{% if site.mvc %}In a server-binding scenario, you can set the group templates without the `Client` prefix—`GroupHeaderTemplate`, `GroupHeaderColumnTemplate`, and `GroupFooterTemplate`. For more information, refer to the demo on [server aggregates of the Grid](https://demos.telerik.com/aspnet-mvc/grid/serveraggregates).
64+
{% else %}
65+
## Limitations
66+
67+
Тhe Grid for Core is not rendered on the server. Therefore, it is not possible to define server-side templates which makes the usage of `.ServerOperations(true)` in this case incompatible.
6468
{% endif %}
6569

6670
## See Also

docs-aspnet/html-helpers/editors/dropdowntree/templates.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ The header template manages the way the pop-up header of a DropDownTree is rende
116116

117117
## Footer Template
118118

119-
The footer template manages the way the pop-up footer of a DropDownList is rendered. The footer is re-rendered on every change of the Data Source. The context of the template is the widget itself.
119+
The footer template manages the way the pop-up footer of a DropDownTree is rendered. The footer is re-rendered on every change of the Data Source. The context of the template is the widget itself.
120120

121121
```
122122
<!-- Template -->
@@ -137,7 +137,7 @@ The footer template manages the way the pop-up footer of a DropDownList is rende
137137

138138
## No-Data Templates
139139

140-
The DropDownList displays `noDataTemplate` in the popup when the data source is empty.
140+
The DropDownTree displays `noDataTemplate` in the popup when the data source is empty.
141141

142142
```
143143
<!-- Template -->

docs-aspnet/html-helpers/editors/upload/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The following example demonstrates how to define the Upload widget by using the
2323
@(Html.Kendo().Upload()
2424
.Name("files")
2525
.Async(a => a
26-
.Save("SaveAsync", "Upload")
26+
.Save("Save", "Upload")
2727
.Remove("Remove", "Upload")
2828
.AutoUpload(true)
2929
)
@@ -37,7 +37,7 @@ public UploadController(IHostingEnvironment hostingEnvironment)
3737
HostingEnvironment = hostingEnvironment;
3838
}
3939
40-
public async Task<ActionResult> SaveAsync(IEnumerable<IFormFile> files)
40+
public async Task<ActionResult> Save(IEnumerable<IFormFile> files)
4141
{
4242
// The Name of the Upload component is "files".
4343
if (files != null)
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
---
2+
title: DateTimePicker Localization in Modern Content Type
3+
description: How to Implement DateTimePicker Localization in Modern Mode
4+
type: how-to
5+
page_title: How to Implement DateTimePicker Localization in Modern Mode | Kendo UI DateTimePicker for jQuery
6+
slug: datetimepicker-localization-modern-type
7+
position:
8+
tags:
9+
ticketid:
10+
res_type: kb
11+
---
12+
13+
## Environment
14+
<table>
15+
<tbody>
16+
<tr>
17+
<td>Product</td>
18+
<td>DateTimePicker for Progress® Kendo UI®</td>
19+
</tr>
20+
</tbody>
21+
</table>
22+
23+
24+
## Description
25+
26+
This sample demonstrates how to implement Dutch Culture and Localization for Kendo DateTimePicker in Modern ContentType.
27+
28+
## Solution
29+
30+
```dojo
31+
32+
<p>Modern Picker with Dutch Localization</p>
33+
34+
<input id="datetimepicker" />
35+
36+
<script>
37+
kendo.culture("nl-NL");
38+
39+
var picker = $("#datetimepicker").kendoDateTimePicker({
40+
componentType: "modern",
41+
culture: "nl-NL",
42+
}).data().kendoDateTimePicker;
43+
44+
var localization = {};
45+
localization["Date"]= "Datum";
46+
localization["Time"]= "Tijd";
47+
localization["Today"]= "Vandaag";
48+
localization["Cancel"]= "Annuleren";
49+
localization["Set"]= "Bewaren";
50+
localization["Now"]= "Nu";
51+
localization["hour"]= "uur";
52+
localization["minute"]= "minuut";
53+
54+
$(".k-datetimepicker .k-select").on("click",function(e){
55+
setTimeout(function(){
56+
for(var key in localization){
57+
picker.popup.element.find("button, a, .k-title").each(function(i,e){
58+
var element = $(e);
59+
60+
if(element.text().trim() == key)
61+
{
62+
element.text(localization[key]);
63+
}
64+
});
65+
};
66+
});
67+
});
68+
</script>
69+
```

src/kendo.autocomplete.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ var __meta__ = { // jshint ignore:line
437437
var options = that.options;
438438
var data = that.dataSource.flatView();
439439
var length = data.length;
440-
var groupsLength = that.dataSource._group.length;
440+
var groupsLength = that.dataSource._group ? that.dataSource._group.length : 0;
441441
var isActive = that.element[0] === activeElement();
442442
var action;
443443

src/kendo.list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ var __meta__ = { // jshint ignore:line
395395
this._clearFilterExpressions(expression);
396396

397397
if ((filter || removed) && that.trigger("filtering", { filter: filter })) {
398-
return;
398+
return $.Deferred().reject().promise();
399399
}
400400

401401
var newExpression = {

styles/web/common/spreadsheet.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,10 @@
336336
}
337337
}
338338

339+
.k-spreadsheet-list-popup {
340+
margin-right: -1px;
341+
}
342+
339343
.k-spreadsheet-names-popup {
340344
.k-item {
341345
position: relative;

tests/calendar/rendering.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,11 @@ it("Month view title honors options.culture", function() {
170170
});
171171

172172
it("month view renders days", function() {
173-
var today = new Date(),
173+
var currDate = new Date(2010, 10, 10),
174174
days = kendo.culture().calendar.days;
175175

176176
div.html(calendar.views[0].content({
177-
date: today,
177+
date: currDate,
178178
empty: template.empty,
179179
otherMonth: true,
180180
content: template.content,

tests/dropdownlist/integration.js

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)