Skip to content

Commit 9ab164d

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 0dc2fda commit 9ab164d

29 files changed

+5942
-4278
lines changed

docs/api/javascript/ui/dropdowntree.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ The widget instance.
592592

593593
### height `String|Number`*(default: 200)*
594594

595-
The height of the suggestion popup in pixels. The default value is 200 pixels. If set to "Auto" the height of the popup will depend on the height of the treeview.
595+
Sets max-height of the embedded treeview in pixels. The default value is 200 pixels. If set to "Auto" the height of the popup will depend on the height of the treeview.
596596

597597
#### Example - set the height
598598

docs/api/javascript/ui/notification.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -502,17 +502,24 @@ If this argument is not supplied, then `"info"` is assumed.
502502
notificationWidget.show("foo text", "warning");
503503
</script>
504504

505-
#### Example - Use the show method and return the message from a function
505+
#### Example - use the show method with a function argument
506506

507507
<span id="notification"></span>
508508
<script>
509509
function getNotificationMessage() {
510-
return "foo text";
510+
return {
511+
myMessage: "foo text"
512+
}
511513
}
512514

513-
var notificationWidget = $("#notification").kendoNotification().data("kendoNotification");
514-
515-
notificationWidget.showText(getNotificationMessage());
515+
var notificationWidget = $("#notification").kendoNotification({
516+
templates: [{
517+
type: "myAlert",
518+
template: "<div>System alert: #= myMessage #</div>"
519+
}]
520+
}).data("kendoNotification");
521+
522+
notificationWidget.show(getNotificationMessage(), "myAlert");
516523
</script>
517524

518525
### showText
@@ -541,24 +548,17 @@ If this argument is not supplied, then `"info"` is assumed.
541548
notificationWidget.showText("foo text", "warning");
542549
</script>
543550

544-
#### Example - use the show method with a function argument
551+
#### Example - Use the show method and return the message from a function
545552

546553
<span id="notification"></span>
547554
<script>
548555
function getNotificationMessage() {
549-
return {
550-
myMessage: "foo text"
551-
}
556+
return "foo text";
552557
}
553558

554-
var notificationWidget = $("#notification").kendoNotification({
555-
templates: [{
556-
type: "myAlert",
557-
template: "<div>System alert: #= myMessage #</div>"
558-
}]
559-
}).data("kendoNotification");
560-
561-
notificationWidget.show(getNotificationMessage(), "myAlert");
559+
var notificationWidget = $("#notification").kendoNotification().data("kendoNotification");
560+
561+
notificationWidget.showText(getNotificationMessage());
562562
</script>
563563

564564
### success

docs/knowledge-base/grid-include-selectall-in-columnmenu.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Render the checkbox within the `columnMenuInit` event of the Grid.
4141
<script>
4242
$(document).ready(function () {
4343
$("#grid").kendoGrid({
44-
columnMenuInit: function (e) {
44+
columnMenuOpen: function (e) {
4545
var mylist = e.container.find(".k-columns-item>ul");
4646
var listitems = mylist.children('li').get();
4747
@@ -51,9 +51,9 @@ Render the checkbox within the `columnMenuInit` event of the Grid.
5151
$(".custom-class input")[0].checked = allChecked;
5252
}
5353
})
54-
55-
$("<li class='custom-class'><span class='k-link'><input type='checkbox' checked onclick='checkAll(this)'/>SelectAll</span></li>").insertBefore(e.container.find(".k-columns-item>ul>li").first());
56-
54+
e.container.find(".custom-class").remove()
55+
e.container.find('.k-filter-item').find('[role="menuitemcheckbox"]').remove()
56+
$("<li class='custom-class'><span class='k-link'><input type='checkbox' checked onclick='checkAll(this)'/>SelectAll</span></li>").insertBefore(e.container.find(".k-columns-item ul li").first());
5757
},
5858
dataSource: {
5959
type: "odata",

src/kendo.combobox.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,6 +1087,8 @@ var __meta__ = { // jshint ignore:line
10871087
if (isFiltered || !hasValue || custom) {
10881088
that.options.value = "";
10891089
that.value("");
1090+
// Reset selected value for cascading
1091+
that._selectedValue = null;
10901092
}
10911093
},
10921094

0 commit comments

Comments
 (0)