Skip to content

Commit 5aa177a

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 707ec1c commit 5aa177a

File tree

5 files changed

+1683
-1683
lines changed

5 files changed

+1683
-1683
lines changed

docs-aspnet/styles-and-layout/client-side-theme-change.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ position: 3
1010

1111
The demo below demonstrates how to allow the user to change the theme of the application.
1212

13-
To see the example, refer to the GitHub repo on how to [change the theme on the client]{% if site.core %}(https://github.com/telerik/ui-for-aspnet-core-examples/blob/master/Kendo.Examples.Mvc/Kendo.Examples.Mvc/Views/StylesAndLayout/ClientThemeChange.cshtml){% else %}(https://github.com/telerik/ui-for-aspnet-mvc-examples/tree/master/styles-and-layout/ChangingThemesOnTheClient){% endif %}.
13+
To see the example, refer to the GitHub repo on how to [change the theme on the client]{% if site.core %}(https://github.com/telerik/ui-for-aspnet-core-examples/blob/master/Telerik.Examples.Mvc/Telerik.Examples.Mvc/Views/StylesAndLayout/ClientThemeChange.cshtml){% else %}(https://github.com/telerik/ui-for-aspnet-mvc-examples/tree/master/styles-and-layout/ChangingThemesOnTheClient){% endif %}.
1414

1515
## See Also
1616

src/kendo.draganddrop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ var __meta__ = { // jshint ignore:line
642642
});
643643

644644
if (kendo.support.touch) {
645-
that.element.css('touch-action', 'none');
645+
that.element.find(that.options.filter).css('touch-action', 'none');
646646
}
647647

648648
that._afterEndHandler = proxy(that._afterEnd, that);

src/kendo.pager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ var __meta__ = { // jshint ignore:line
342342
if (total > 0) {
343343
html = kendo.format(options.messages.display,
344344
that.dataSource.options.endless ? 1 : Math.min((page - 1) * (that.dataSource.pageSize() || 0) + 1, collapsedTotal), // first item in the page
345-
Math.min(page * pageSize, collapsedTotal), // last item in the page
345+
Math.min(page * pageSize, collapsedTotal, total), // last item in the page
346346
total);
347347
} else {
348348
html = options.messages.empty;

src/kendo.validator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ var __meta__ = { // jshint ignore:line
434434

435435
customMessage = kendo.isFunction(customMessage) ? customMessage(input) : customMessage;
436436

437-
return kendo.format(input.attr(kendo.attr(ruleKey + "-msg")) || input.attr("validationMessage") || nonDefaultMessage || input.attr("title") || customMessage || "",
437+
return kendo.format(input.attr(kendo.attr(ruleKey + "-msg")) || input.attr("validationMessage") || nonDefaultMessage || customMessage || input.attr("title") || "",
438438
fieldName,
439439
input.attr(ruleKey) || input.attr(kendo.attr(ruleKey)));
440440
},

0 commit comments

Comments
 (0)