Skip to content

Commit 25a4773

Browse files
committed
rebase
1 parent 75e9ed7 commit 25a4773

File tree

3 files changed

+16
-3
lines changed

3 files changed

+16
-3
lines changed

src/demo-app/data-table/data-table-demo.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@
33
<button md-raised-button (click)="connect()">Connect New Data Source</button>
44
<button md-raised-button (click)="disconnect()" [disabled]="!dataSource">Disconnect Data Source</button>
55

6+
<div>
67
<button md-raised-button (click)="_peopleDatabase.shuffle(changeReferences)">Randomize Data</button>
78
<md-checkbox [(ngModel)]="changeReferences">Change references</md-checkbox>
9+
</div>
810

9-
<span>Track By</span>
11+
<div class="demo-track-by-select">
12+
<div class="demo-track-by-label">Track By</div>
1013
<md-radio-group [(ngModel)]="trackByStrategy">
11-
<md-radio-button [value]="'id'">ID</md-radio-button>
1214
<md-radio-button [value]="'reference'">Reference</md-radio-button>
15+
<md-radio-button [value]="'id'">ID</md-radio-button>
1316
<md-radio-button [value]="'index'">Index</md-radio-button>
1417
</md-radio-group>
1518
</div>
19+
</div>
1620

1721
<div class="demo-highlighter">
1822
Highlight:

src/demo-app/data-table/data-table-demo.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
margin: 16px 0;
1818
}
1919

20+
.demo-track-by-select {
21+
display: flex;
22+
align-items: center;
23+
24+
.demo-track-by-label {
25+
margin-right: 8px;
26+
}
27+
}
28+
2029
.demo-highlighter .mat-checkbox {
2130
margin: 0 8px;
2231
}

src/demo-app/data-table/people-database.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class PeopleDatabase {
2424

2525
initialize() {
2626
LATEST_ID = 0;
27-
this.data = [];
27+
this.dataChange.next([]);
2828
for (let i = 0; i < 100; i++) { this.addPerson(); }
2929
}
3030

0 commit comments

Comments
 (0)