Skip to content

Commit d60feef

Browse files
authored
Merge branch 'master' into fix-#1989
2 parents 0048939 + 820d2a1 commit d60feef

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<a href="https://www.netlify.com" target="_blank">
1414
<img src="https://www.netlify.com/img/global/badges/netlify-color-accent.svg"/>
1515
</a>
16+
<a href="https://bestpractices.coreinfrastructure.org/projects/5887">
17+
<img src="https://bestpractices.coreinfrastructure.org/projects/5887/badge">
18+
</a>
1619
</p>
1720
</p>
1821

src/content-switcher/content-switcher.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ import { isFocusInLastItem, isFocusInFirstItem } from "carbon-components-angular
3636
class="bx--content-switcher"
3737
[class.bx--content-switcher--light]="theme === 'light'"
3838
role="tablist">
39-
<ng-content></ng-content>
39+
<span class="bx--content-switcher__label">
40+
<ng-content></ng-content>
41+
</span>
4042
</div>
4143
`
4244
})

src/table/table-model.class.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ export class TableModel implements PaginationModel {
156156
*/
157157
set totalDataLength(length: number) {
158158
// if this function is called without a parameter we need to set to null to avoid having undefined != null
159-
this._totalDataLength = length || null;
159+
this._totalDataLength = isNaN(length) ? null : length;
160160
}
161161

162162
/**
@@ -621,7 +621,7 @@ export class TableModel implements PaginationModel {
621621
* @param value state to set all rows to. Defaults to `true`
622622
*/
623623
selectAll(value = true) {
624-
if (this.data.length >= 1) {
624+
if (this.data.length >= 1 && this.data[0].length >= 1) {
625625
for (let i = 0; i < this.rowsSelected.length; i++) {
626626
this.selectRow(i, value);
627627
}

0 commit comments

Comments
 (0)