Skip to content

Commit dc5cf62

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 9385545 commit dc5cf62

File tree

15 files changed

+203
-66
lines changed

15 files changed

+203
-66
lines changed

‎docs-aspnet/_config.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,8 @@ navigation:
240240
title: "Chat"
241241
"tag-helpers/interactivity":
242242
title: "Interactivity and UX"
243+
"tag-helpers/interactivity/loader":
244+
title: "Loader"
243245
"tag-helpers/media":
244246
title: "Media"
245247
"tag-helpers/pdf":
@@ -367,6 +369,8 @@ navigation:
367369
title: "Chat"
368370
"html-helpers/interactivity":
369371
title: "Interactivity and UX"
372+
"html-helpers/interactivity/loader":
373+
title: "Loader"
370374
"html-helpers/interactivity/sortable/integration":
371375
title: "Integration"
372376
position: 6
@@ -480,6 +484,8 @@ navigation:
480484
title: "Gantt"
481485
"*imageeditor":
482486
title: "Image Editor"
487+
"*loader":
488+
title: "Loader"
483489
"*lineargauge":
484490
title: "LinearGauge"
485491
"*listbox":
@@ -837,7 +843,7 @@ defaults:
837843
title_prefix: "Core DragAndDrop Component"
838844
-
839845
scope:
840-
path: "html-helpers/interactivity/loder"
846+
path: "html-helpers/interactivity/loader"
841847
values:
842848
title_prefix: "Core Loader Component"
843849
-

‎docs-aspnet/accessibility/accessibility-compliance-core.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<td>Loader</td>
163163
<td>Yes</td>
164164
<td>AAA</td>
165-
<td>No</td>
165+
<td>n/a</td>
166166
</tr>
167167
<tr>
168168
<td>Map</td>

‎docs-aspnet/accessibility/accessibility-compliance-mvc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<td>Loader</td>
163163
<td>Yes</td>
164164
<td>AAA</td>
165-
<td>No</td>
165+
<td>-</td>
166166
</tr>
167167
<tr>
168168
<td>Map</td>

‎docs/accessibility/section-508-wcag.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ The following table lists the Section 508 and WCAG 2.1 compliance levels of supp
4545
|Gantt |Yes |AA |[Browse](https://demos.telerik.com/kendo-ui/gantt/index)
4646
|Grid |Yes |AAA |[Browse](https://demos.telerik.com/kendo-ui/grid/index)
4747
|ImageEditor |Yes |AА |[Browse](https://demos.telerik.com/kendo-ui/imageeditor/index)
48+
|Loader |Yes |AАA |[Browse](https://demos.telerik.com/kendo-ui/loader/index)
4849
|LinearGauge |Yes |AAA |[Browse](https://demos.telerik.com/kendo-ui/linear-gauge/index)
4950
|ListBox |Yes |AAA |[Browse](https://demos.telerik.com/kendo-ui/listbox/index)
5051
|ListView |Yes |AAA |[Browse](https://demos.telerik.com/kendo-ui/listview/index)

‎docs/jsp/introduction.md‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,9 @@ div#kendo_trial .kendo_download_btn {
3737
}
3838
</style>
3939

40-
<script type="text/javascript">
41-
42-
$(document).ready(function(){
43-
var mac = navigator.userAgent.match(/(Mac)/i);
44-
var $btnWin = $(".js-btnWin");
45-
var $btnOSX = $(".js-btnOSX");
46-
47-
if (mac) {
48-
$btnOSX.show();
49-
$btnWin.hide();
50-
} else {
51-
$btnOSX.hide();
52-
$btnWin.show();
53-
}
54-
});
55-
56-
</script>
57-
5840
<div id="kendo_trial">
5941
<br />
60-
<a href="https://www.telerik.com/download-trial-file/v2/ui-for-jsp" class="kendo_download_btn js-btnWin" style="display: none">Download Free Trial</a>
61-
<a href="https://www.telerik.com/download-trial-file/v2/ui-for-jsp" class="kendo_download_btn js-btnOSX" style="display: none">Download Free Trial</a>
42+
<a href="https://www.telerik.com/download-trial-file/v2/ui-for-jsp" class="kendo_download_btn">Download Free Trial</a>
6243
</div>
6344

6445
## Getting Started

‎docs/php/introduction.md‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,9 @@ div#kendo_trial .kendo_download_btn {
3636
}
3737
</style>
3838

39-
<script type="text/javascript">
40-
41-
$(document).ready(function(){
42-
var mac = navigator.userAgent.match(/(Mac)/i);
43-
var $btnWin = $(".js-btnWin");
44-
var $btnOSX = $(".js-btnOSX");
45-
46-
if (mac) {
47-
$btnOSX.show();
48-
$btnWin.hide();
49-
} else {
50-
$btnOSX.hide();
51-
$btnWin.show();
52-
}
53-
});
54-
55-
</script>
56-
5739
<div id="kendo_trial">
5840
<br />
59-
<a href="https://www.telerik.com/download-trial-file/v2/ui-for-php" class="kendo_download_btn js-btnWin" style="display: none">Download Free Trial</a>
60-
<a href="https://www.telerik.com/download-trial-file/v2/ui-for-php" class="kendo_download_btn js-btnOSX" style="display: none">Download Free Trial</a>
41+
<a href="https://www.telerik.com/download-trial-file/v2/ui-for-php" class="kendo_download_btn">Download Free Trial</a>
6142
</div>
6243

6344
## Getting Started

‎src/kendo.data.odata.js‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ var __meta__ = { // jshint ignore:line
267267
}
268268

269269
function createBatchRequest(transport, colections) {
270-
var options = {};
270+
var options = extend({}, transport.options.batch);
271271
var boundary = createBoundary("sf_batch_");
272272
var requestBody = "";
273273
var changeId = 0;
@@ -276,9 +276,9 @@ var __meta__ = { // jshint ignore:line
276276

277277
options.type = transport.options.batch.type;
278278
options.url = isFunction(batchURL) ? batchURL() : batchURL;
279-
options.headers = {
280-
"Content-Type": "multipart/mixed; boundary=" + boundary
281-
};
279+
options.headers = extend(options.headers || {}, {
280+
"Content-Type": "multipart/mixed; boundary=" + boundary
281+
});
282282

283283
if (colections.updated.length) {
284284
requestBody += processCollection(colections.updated, boundary, changeset, changeId, transport, "update", false);
@@ -489,6 +489,13 @@ var __meta__ = { // jshint ignore:line
489489
result.$count = true;
490490
delete result.$inlinecount;
491491
}
492+
493+
if (result.$filter) {
494+
// Remove the single quotation marks around the GUID (OData v4).
495+
result.$filter = result.$filter.replace(/('[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')/ig, function (x) {
496+
return x.substring(1, x.length - 1);
497+
});
498+
}
492499

493500
return result;
494501
},

‎src/kendo.datetimepicker.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ var __meta__ = { // jshint ignore:line
489489
}
490490

491491
value = parse(value, options.parseFormats, options.culture);
492+
timeViewOptions.maxSet = false;
492493

493494
if (!value) {
494495
return;
@@ -521,6 +522,7 @@ var __meta__ = { // jshint ignore:line
521522
return;
522523
} else if (!minDateEqual) {
523524
timeViewOptions.min = MIN;
525+
timeViewOptions.maxSet = true;
524526
}
525527
}
526528
} else {
@@ -580,6 +582,7 @@ var __meta__ = { // jshint ignore:line
580582
if (date) {
581583
old = that._old;
582584
timeViewOptions = timeView.options;
585+
timeViewOptions.maxSet = false;
583586

584587
if (dates[0]) {
585588
dates = $.grep(dates, function(d) { return isEqualDatePart(date, d); });
@@ -603,6 +606,7 @@ var __meta__ = { // jshint ignore:line
603606
skip = true;
604607
} else {
605608
timeViewOptions.max = max;
609+
timeViewOptions.maxSet = true;
606610
if (!rebind) {
607611
timeViewOptions.min = MIN;
608612
}

‎src/kendo.listview.js‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ var __meta__ = { // jshint ignore:line
119119
direction: "row",
120120
wrap: "nowrap"
121121
},
122-
grid: {}
122+
grid: {},
123+
scrollable: false
123124
},
124125

125126
setOptions: function(options) {
@@ -167,6 +168,10 @@ var __meta__ = { // jshint ignore:line
167168
if (this.options.autoBind) {
168169
dataSource.fetch();
169170
}
171+
172+
if (this.options.scrollable === "endless") {
173+
this._bindScrollable();
174+
}
170175
},
171176

172177
_unbindDataSource: function() {
@@ -478,25 +483,30 @@ var __meta__ = { // jshint ignore:line
478483
});
479484

480485
if (scrollable === "endless") {
481-
var originalPageSize = that._endlessPageSize = that.dataSource.options.pageSize;
482-
483-
that.content
484-
.off("scroll" + NS)
485-
.on("scroll" + NS, function () {
486-
if (this.scrollTop + this.clientHeight - this.scrollHeight >= -15 &&
487-
!that._endlessFetchInProgress &&
488-
that._endlessPageSize < that.dataSource.total()) {
489-
that._skipRerenderItemsCount = that._endlessPageSize;
490-
that._endlessPageSize = that._skipRerenderItemsCount + originalPageSize;
491-
that.dataSource.options.endless = true;
492-
that._endlessFetchInProgress = true;
493-
that.dataSource.pageSize(that._endlessPageSize);
494-
}
495-
});
486+
that._bindScrollable();
496487
}
497488
}
498489
},
499490

491+
_bindScrollable: function (){
492+
var that = this;
493+
var originalPageSize = that._endlessPageSize = that.dataSource.options.pageSize;
494+
495+
that.content
496+
.off("scroll" + NS)
497+
.on("scroll" + NS, function () {
498+
if (this.scrollTop + this.clientHeight - this.scrollHeight >= -15 &&
499+
!that._endlessFetchInProgress &&
500+
that._endlessPageSize < that.dataSource.total()) {
501+
that._skipRerenderItemsCount = that._endlessPageSize;
502+
that._endlessPageSize = that._skipRerenderItemsCount + originalPageSize;
503+
that.dataSource.options.endless = true;
504+
that._endlessFetchInProgress = true;
505+
that.dataSource.pageSize(that._endlessPageSize);
506+
}
507+
});
508+
},
509+
500510
current: function(candidate) {
501511
var that = this,
502512
element = that.element,

‎src/kendo.timepicker.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ var __meta__ = { // jshint ignore:line
137137
that.options = options;
138138
that._dates = [];
139139

140-
141140
that._createList(options.timeView && options.timeView.list === "scroll");
142141

143142
if (id) {
@@ -810,6 +809,9 @@ var __meta__ = { // jshint ignore:line
810809
}
811810
result.push(new Date(start));
812811
start.setTime(start.getTime() + msInterval);
812+
if (!msMax && this.options.maxSet){
813+
break;
814+
}
813815
}
814816

815817
return result;
@@ -1286,7 +1288,8 @@ var __meta__ = { // jshint ignore:line
12861288
element.attr(ARIA_ACTIVEDESCENDANT, timeView._optionID);
12871289
}
12881290
},
1289-
specifiedRange: that._specifiedRange
1291+
specifiedRange: that._specifiedRange,
1292+
maxSet: +options.max != +TODAY
12901293
}));
12911294
ul = timeView.ul;
12921295

@@ -1492,6 +1495,11 @@ var __meta__ = { // jshint ignore:line
14921495
},
14931496

14941497
max: function (value) {
1498+
if (value && this.timeView) {
1499+
this.timeView.options.maxSet = true;
1500+
} else if (this.timeView) {
1501+
this.timeView.options.maxSet = false;
1502+
}
14951503
return this._option("max", value);
14961504
},
14971505

0 commit comments

Comments
 (0)