Skip to content

Commit da95906

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 6e98cfa commit da95906

File tree

7 files changed

+79
-26
lines changed

7 files changed

+79
-26
lines changed

src/kendo.binder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ var __meta__ = { // jshint ignore:line
10681068
var element = this.element,
10691069
value = element.value;
10701070

1071-
if (value == "on" || value == "off") {
1071+
if (value == "on" || value == "off" || this.element.type == "checkbox") {
10721072
value = element.checked;
10731073
}
10741074

src/kendo.list.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,6 +1365,7 @@ var __meta__ = { // jshint ignore:line
13651365
}
13661366

13671367
var activeFilter = that.filterInput && that.filterInput[0] === activeElement();
1368+
var selection;
13681369

13691370
if (current) {
13701371
dataItem = listView.dataItemByIndex(listView.getElementIndex(current));
@@ -1378,7 +1379,7 @@ var __meta__ = { // jshint ignore:line
13781379
return;
13791380
}
13801381

1381-
that._select(current);
1382+
selection = that._select(current);
13821383
} else if (that.input) {
13831384
if (that._syncValueAndText() || that._isSelect) {
13841385
that._accessor(that.input.val());
@@ -1393,7 +1394,13 @@ var __meta__ = { // jshint ignore:line
13931394
if (activeFilter && key === keys.TAB) {
13941395
that.wrapper.focusout();
13951396
} else {
1396-
that._blur();
1397+
if (selection && typeof selection.done === "function") {
1398+
selection.done(function () {
1399+
that._blur();
1400+
});
1401+
} else {
1402+
that._blur();
1403+
}
13971404
}
13981405

13991406
that.close();

styles/web/common/grid.less

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -692,9 +692,8 @@ form.k-filter-menu .k-textbox
692692
display: inline-block;
693693
}
694694

695-
.k-grid .k-button
696-
{
697-
margin: 0 .16em;
695+
.k-grid .k-button {
696+
margin: .16em;
698697
}
699698

700699
@grid-button-min-width: 64px;
@@ -757,11 +756,6 @@ html .k-grid-edit-row .k-tooltip
757756
margin-left: .6em;
758757
}
759758

760-
.k-grid tbody td>.k-grid-delete
761-
{
762-
margin-top: -.2em;
763-
margin-bottom: -.2em;
764-
}
765759

766760
// Grid :: resizing
767761

styles/web/common/inputs.less

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -619,13 +619,9 @@ body .k-datetimepicker .k-select {
619619
.k-datetimepicker .k-select {
620620
width: 4em;
621621

622-
.k-link-date {
623-
margin-left: -.285em;
624-
}
625-
626-
.k-link-time {
627-
margin-right: -.285em;
628-
margin-left: .428em;
622+
.k-link {
623+
display: inline-block;
624+
width: 50%;
629625
}
630626
}
631627

styles/web/type-default.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
@hover-background-color: @hover-background;
7979
@hover-border-color: contrast(@base, lighten(@base, 1%), darken(@base, 20%), 0.5);
8080
@hover-shadow: none;
81-
@selected-background-color: @accent;
82-
@selected-border-color: contrast(@selected-background, lighten(@accent, 1%), darken(@accent, 13%), 0.5);
81+
@selected-background-color: @selected-background;
82+
@selected-border-color: contrast(@selected-background, lighten(@selected-background, 1%), darken(@selected-background, 13%), 0.5);
8383
@selected-shadow: none;
8484
@focused-border-color: @widget-border-color;
8585
@focused-shadow: 0 0 3px 0 @shadow-color;

styles/web/type-material.less

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,18 +2493,16 @@ span.k-colorpicker {
24932493
.k-datepicker,
24942494
.k-timepicker,
24952495
.k-datetimepicker {
2496-
background-color: @drop-down-background;
2496+
&,
2497+
.k-input {
2498+
background-color: @drop-down-background;
2499+
}
24972500
}
24982501

24992502
.k-picker-wrap.k-state-default > .k-select {
25002503
border-color: @drop-down-background;
25012504
}
25022505

2503-
.k-datepicker .k-input,
2504-
.k-timepicker .k-input {
2505-
background-color: @drop-down-background;
2506-
}
2507-
25082506
.k-autocomplete.k-state-active .k-input,
25092507
.k-picker-wrap.k-state-active .k-input,
25102508
.k-numeric-wrap.k-state-active .k-input

tests/dropdownlist/virtualization.js

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,5 +240,63 @@
240240
done();
241241
});
242242
});
243+
244+
245+
it("value is changed on Enter", function(done) {
246+
var dropdownlist = new DropDownList(select, {
247+
close: function(e) { e.preventDefault(); },
248+
height: CONTAINER_HEIGHT,
249+
animation: false,
250+
filter: "startswith",
251+
dataTextField: "text",
252+
dataValueField: "value",
253+
dataSource: createAsyncDataSource(),
254+
change: function (e) {
255+
assert.equal(e.sender.value(), "5");
256+
done();
257+
},
258+
virtual: {
259+
valueMapper: function(o) { o.success(o.value); },
260+
itemHeight: 20
261+
}
262+
});
263+
264+
dropdownlist.one("dataBound", function() {
265+
dropdownlist.filterInput.focus().val("Item 5");
266+
dropdownlist.filterInput.trigger({ type: "keydown" });
267+
268+
dropdownlist.one("dataBound", function (){
269+
dropdownlist.filterInput.trigger({ type: "keydown", keyCode: kendo.keys.ENTER });
270+
});
271+
});
272+
dropdownlist.open();
273+
});
274+
275+
it("item is selected on DOWN", function(done) {
276+
var dropdownlist = new DropDownList(select, {
277+
close: function(e) { e.preventDefault(); },
278+
height: CONTAINER_HEIGHT,
279+
animation: false,
280+
dataTextField: "text",
281+
dataValueField: "value",
282+
dataSource: createAsyncDataSource(),
283+
select: function (e) {
284+
assert.equal(e.dataItem.value, "1");
285+
done();
286+
},
287+
virtual: {
288+
valueMapper: function(o) { o.success(o.value); },
289+
itemHeight: 20
290+
},
291+
value: 0
292+
});
293+
294+
dropdownlist.one("dataBound", function() {
295+
dropdownlist.wrapper.trigger({ type: "keydown", keyCode: kendo.keys.DOWN });
296+
});
297+
298+
dropdownlist.open();
299+
});
300+
243301
});
244302
}());

0 commit comments

Comments
 (0)