Skip to content

Commit da189ac

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent b24db73 commit da189ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+826
-477
lines changed

docs-aspnet/html-helpers/interactivity/sortable/integration/listview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ The Sortable reorders the HTML DOM elements. It does not automatically update th
2121

2222
## Reordering of ListView Items
2323

24-
To reorder the items of the ListView, initialize the Sortable on the ListView element. Normally, the `filter` property selects all elements that are direct children of the ListView element, for example, `.filter(">div")`.
24+
To reorder the items of the ListView, initialize the Sortable on the ListView element. Specify the list items using the `filter` property -- select all elements that are direct children of the ListView content element, for example, `.filter(".k-listview-content > div")`.
2525

2626
## Reordering in Editable ListViews
2727

28-
If the editing functionality of the ListView is enabled, use a more specific filter selector that excludes the item which is currently in editing mode, for example, `.filter(">div:not(.k-edit-item)"`. In this way, the Sortable functionality will not interfere with the editing feature of the ListView.
28+
If the editing functionality of the ListView is enabled, use a more specific filter selector that excludes the item which is currently in editing mode, for example, `.filter(".k-listview-item > div:not(.k-edit-item)"`. In this way, the Sortable functionality will not interfere with the editing feature of the ListView.
2929

3030
To reorder the data items of the ListView, use the [approach for reordering the Grid data items]({% slug sortable_aspnetcore_integration_grid %}#reordering-of-grid-table-rows). For more information on the Sortable events, refer to the [Sortable server-side API](/api/sortable#eventssystemactionkendomvcuifluentsortableeventbuilder).
3131

docs/api/javascript/ui/listview.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ Puts the specified ListView item in edit mode. Fires the [edit](/api/javascript/
744744
// get a reference to the ListView widget
745745
var listView = $("#listView").data("kendoListView");
746746
// edit the first ListView item
747-
listView.edit(listView.element.children().first());
747+
listView.edit(listView.content.children().first());
748748
});
749749
</script>
750750

@@ -831,7 +831,7 @@ Removes the specified item from the ListView. Triggers [remove](/api/javascript/
831831
// get a reference to the list view widget
832832
var listView = $("#listView").data("kendoListView");
833833
// remove first list view item
834-
listView.remove(listView.element.children().first());
834+
listView.remove(listView.content.children().first());
835835
});
836836
</script>
837837

@@ -942,7 +942,7 @@ Gets/sets the selected ListView item(s).
942942
// get a reference to the ListView widget
943943
var listView = $("#listView").data("kendoListView");
944944
// selects first ListView item
945-
listView.select(listView.element.children().first());
945+
listView.select(listView.content.children().first());
946946
});
947947
</script>
948948

@@ -1043,7 +1043,7 @@ The event handler function context (available via the `this` keyword) will be se
10431043
}
10441044
});
10451045
var listView = $("#listView").data("kendoListView");
1046-
listView.edit(listView.element.children().first());
1046+
listView.edit(listView.content.children().first());
10471047
</script>
10481048

10491049
#### To set after initialization
@@ -1089,7 +1089,7 @@ The event handler function context (available via the `this` keyword) will be se
10891089
listView.bind("cancel", function(e) {
10901090
console.log("Cancelled editing of item with id " + e.model.id);
10911091
});
1092-
listView.edit(listView.element.children().first());
1092+
listView.edit(listView.content.children().first());
10931093
</script>
10941094

10951095
#### Event Data

docs/controls/interactivity/sortable/integration/listview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ The Sortable reorders the HTML DOM elements. It does not automatically update th
2121

2222
## Reordering of ListView Items
2323

24-
To reorder the items of the ListView, initialize the Sortable on the ListView element. Normally, the `filter` property selects all elements that are direct children of the ListView element, for example, `.filter(">div")`.
24+
To reorder the items of the ListView, initialize the Sortable on the ListView element. Specify the list items using the `filter` property -- select all elements that are direct children of the ListView content element, for example, `.filter(".k-listview-content > div")`.
2525

2626
## Reordering in Editable ListViews
2727

28-
If the editing functionality of the ListView is enabled, use a more specific filter selector that excludes the item which is currently in editing mode, for example, `.filter(">div:not(.k-edit-item)"`. In this way, the Sortable functionality will not interfere with the editing feature of the ListView.
28+
If the editing functionality of the ListView is enabled, use a more specific filter selector that excludes the item which is currently in editing mode, for example, `.filter(".k-listview-content > div:not(.k-edit-item)"`. In this way, the Sortable functionality will not interfere with the editing feature of the ListView.
2929

3030
To reorder the data items of the ListView, use the [approach for reordering the Grid data items]({% slug integrationwith_grid_sortable %}#reordering-of-grid-table-rows). For more information on the Sortable events, refer to the [Sortable API](/api/javascript/ui/sortable#events) and the [demo on integrating the Sortable with the ListView](https://demos.telerik.com/kendo-ui/web/sortable/integration-listview.html).
3131

docs/intro/scripts/scripts-editors.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ The following table lists the individual script files for the Kendo UI widgets t
107107
| | kendo.upload.js | Image Browser feature (optional) |
108108
| | kendo.filebrowser.js | Image Browser feature (optional) |
109109
| | kendo.imagebrowser.js | Image Browser feature (optional) |
110+
| | kendo.breadcrumb.js | Image Browser feature (optional) |
110111
| | kendo.resizable.js | Resize handle feature (optional) |
111112
| | kendo.tabstrip.js | Table wizard dialog feature (optional) |
112113
| | kendo.numerictextbox.js | Table wizard dialog feature (optional) |

docs/knowledge-base/listview-drag-drop-sortable-items.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ The following example demonstrates the full implementation of the suggested appr
9999
});
100100
101101
$('#itemlist').kendoSortable({
102+
filter: ".k-listview-content > div",
102103
connectWith: "#newlist",
103104
change: function(e) {
104105
var sender = e.draggableEvent.sender;
@@ -113,6 +114,7 @@ The following example demonstrates the full implementation of the suggested appr
113114
});
114115
115116
$('#newlist').kendoSortable({
117+
filter: ".k-listview-content > div",
116118
connectWith: "#itemlist",
117119
change: function(e) {
118120
var sender = e.draggableEvent.sender;

src/kendo.colorpicker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,12 +612,12 @@ var __meta__ = { // jshint ignore:line
612612
'# } #' +
613613
'#= !data.input ? \'style=\"visibility: hidden;\"\' : \"\" #>' +
614614
'# if (clearButton && !_standalone) { #' +
615-
'<span class="k-clear-color k-button k-bare" title="#: messages.clearColor #"></span>' +
615+
'<span class="k-clear-color k-button k-flat" title="#: messages.clearColor #"></span>' +
616616
'# } #' +
617617
'</div></div></div>' +
618618
'# } #' +
619619
'# if (clearButton && !_standalone && !preview) { #' +
620-
'<div class="k-clear-color-container"><span class="k-clear-color k-button k-bare">#: messages.clearColor #</span></div>' +
620+
'<div class="k-clear-color-container"><span class="k-clear-color k-button k-flat">#: messages.clearColor #</span></div>' +
621621
'# } #' +
622622
'<div class="k-hsv-rectangle"><div class="k-hsv-gradient"></div><div class="k-draghandle"></div></div>' +
623623
'<div class="k-sliders-wrap k-vbox">' +

src/kendo.core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3113,7 +3113,7 @@ function pad(number, digits, end) {
31133113

31143114
dataSource = parseOption(element, "dataSource");
31153115

3116-
options = $.extend({}, parseOptions(element, widget.fn.options), options);
3116+
options = $.extend({}, parseOptions(element, $.extend({}, widget.fn.options, widget.fn.defaults) ), options);
31173117

31183118
if (dataSource) {
31193119
if (typeof dataSource === STRING) {

src/kendo.data.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4165,7 +4165,7 @@ var __meta__ = { // jshint ignore:line
41654165
}
41664166
groupCount = (group.subgroupCount || group.itemCount) + 1;
41674167
itemsToSkip = options.skip - options.skipped;
4168-
hasNotRequestedItems = (group.items.length - itemsToSkip) < (options.take - options.taken);
4168+
hasNotRequestedItems = !group.items || (group.items.length - itemsToSkip) < (options.take - options.taken);
41694169

41704170
if (!that._hasExpandedSubGroups(group) && itemsToSkip > groupCount) {
41714171
options.skipped += groupCount;

src/kendo.datetimepicker.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,16 +254,16 @@ var __meta__ = { // jshint ignore:line
254254
that._inputWrapper.addClass(FOCUSED);
255255
})
256256
.on("focusout" + ns, function() {
257-
if(that.options.singlePopup){
258-
return;
259-
}
260257
that._inputWrapper.removeClass(FOCUSED);
261258
if (element.val() !== that._oldText) {
262259
that._change(element.val());
263260
if (!element.val()) {
264261
that.dateView.current(kendo.calendar.getToday());
265262
}
266263
}
264+
if (that.options.singlePopup) {
265+
return;
266+
}
267267
that.close("date");
268268
that.close("time");
269269
});
@@ -367,6 +367,15 @@ var __meta__ = { // jshint ignore:line
367367

368368
that.popup.open();
369369

370+
if (view === "time") {
371+
that._switchToTimeView();
372+
} else {
373+
that._switchToDateView();
374+
}
375+
376+
this._dateIcon.toggle(view !== "time");
377+
this._timeIcon.toggle(view === "time");
378+
370379
setTimeout(function() {
371380
that.popup._hovered = popupHovered;
372381
}, 1);
@@ -653,10 +662,14 @@ var __meta__ = { // jshint ignore:line
653662
id: id,
654663
anchor: that.wrapper,
655664
change: function() {
665+
var value = that._applyDateValue();
666+
656667
if(options.singlePopup){
668+
that.timeView._value.setFullYear(value.getFullYear());
669+
that.timeView._value.setMonth(value.getMonth());
670+
that.timeView._value.setDate(value.getDate());
657671
that._switchToTimeView();
658672
} else {
659-
var value = that._applyDateValue();
660673
that._change(value);
661674
that.close("date");
662675
}
@@ -710,6 +723,7 @@ var __meta__ = { // jshint ignore:line
710723
max: options.componentType === "modern" ? options.max : new DATE(MAX),
711724
dates: msMin === options.max.getTime() ? [new Date(msMin)] : [],
712725
parseFormats: options.parseFormats,
726+
validateDate: true,
713727
change: function(value, trigger) {
714728
value = that._applyTimeValue(value);
715729

@@ -995,6 +1009,7 @@ var __meta__ = { // jshint ignore:line
9951009
},
9961010

9971011
_switchToTimeView: function() {
1012+
this.timeView._updateRanges();
9981013
this.popup.element.find(".k-group-start, .k-group-end").removeClass(STATE_ACTIVE).eq(1).addClass(STATE_ACTIVE);
9991014
this.popup.element.find(".k-datetime-wrap").removeClass("k-date-tab").addClass("k-time-tab");
10001015
},
@@ -1011,8 +1026,9 @@ var __meta__ = { // jshint ignore:line
10111026

10121027
_setClickHandler: function() {
10131028
var value = this._applyDateValue();
1014-
var time = this.timeView._currentlySelected;
1029+
var time = this.timeView._currentlySelected || new Date();
10151030

1031+
value = value || new Date();
10161032
this.timeView._updateCurrentlySelected();
10171033
value.setHours(time.getHours());
10181034
value.setMinutes(time.getMinutes());

src/kendo.tabstrip.js

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

174174
function scrollButtonHtml(buttonClass, iconClass) {
175-
return "<span class='k-button k-button-icon k-bare k-tabstrip-" + buttonClass + "' unselectable='on'><span class='k-icon " + iconClass + "'></span></span>";
175+
return "<span class='k-button k-button-icon k-flat k-tabstrip-" + buttonClass + "' unselectable='on'><span class='k-icon " + iconClass + "'></span></span>";
176176
}
177177

178178
var TabStrip = Widget.extend({

0 commit comments

Comments
 (0)