Skip to content

Commit

Permalink
Merge pull request #2144 from IgniteUI/masenov/fix-2124-211
Browse files Browse the repository at this point in the history
Add default height for the list item of igCombo
  • Loading branch information
zdrawku authored Aug 31, 2021
2 parents 080287d + e6c2ca8 commit 7a748ff
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 2 additions & 0 deletions src/css/structure/modules/infragistics.ui.combo.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@
cursor: default;
white-space: nowrap;
background-image: none;
/* M.A. August 31th, 2021 Bug #2119 & #2124 Add default height */
height: 1.3125rem;
}

.ui-igcombo-listitemtextwithcheckbox {
Expand Down
4 changes: 3 additions & 1 deletion tests/unit/combo/rendering/rendering-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ QUnit.test('[ID7] igCombo scrolling tests', function (assert) {
});

QUnit.test('[ID8] igCombo virtualization tests', function (assert) {
assert.expect(43);
assert.expect(44);

var combo, $list, $dropDownCont, $scrollCont, $scroll,
done = assert.async(),
Expand Down Expand Up @@ -546,6 +546,8 @@ QUnit.test('[ID8] igCombo virtualization tests', function (assert) {
assert.ok($(this).text() === localData[i + itemsIncrement].name, "The item value " + $(this).text() + " should be equal to data source value: " + localData[i].name);
});

assert.ok($($listItems[0]).outerHeight() === $($listItems[1]).outerHeight(), "The first and second items height should be equal to: " + $($listItems[0]).outerHeight());

combo.listScrollTop(860);

$.ig.TestUtil.wait(10).then(function () {
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/combo/sample-data/local-data.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
window.localData = [{
"id": 0,
"name": "magna"
}, {
"id": 0.5,
"name": "アイテム"
}, {
"id": 1,
"name": "non"
Expand Down Expand Up @@ -115,7 +118,4 @@ window.localData = [{
}, {
"id": 38,
"name": "exercitation"
}, {
"id": 39,
"name": "labore"
}];

0 comments on commit 7a748ff

Please sign in to comment.