From 93fd74ce1ff8c4cd46aa8d458bca5839addd2fe3 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Tue, 8 Aug 2017 23:10:00 +0200 Subject: [PATCH] chore: add md-table to universal app * Adds the md-table component to the universal app. This means that it will be verified by the prerender task on the CI. --- .../kitchen-sink/kitchen-sink.html | 18 +++++++++++++++--- src/universal-app/kitchen-sink/kitchen-sink.ts | 10 ++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/universal-app/kitchen-sink/kitchen-sink.html b/src/universal-app/kitchen-sink/kitchen-sink.html index 08de2c72768c..672e3c5669e4 100644 --- a/src/universal-app/kitchen-sink/kitchen-sink.html +++ b/src/universal-app/kitchen-sink/kitchen-sink.html @@ -250,12 +250,24 @@

Expansion Panel

CDK Table

- + ID {{row.userId}} - - + + + +

Material Table

+ + + + ID + {{row.userId}} + + + + + diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts index cf5b756795c1..faab707a3045 100644 --- a/src/universal-app/kitchen-sink/kitchen-sink.ts +++ b/src/universal-app/kitchen-sink/kitchen-sink.ts @@ -27,6 +27,7 @@ import { MdSlideToggleModule, MdSnackBarModule, MdSortModule, + MdTableModule, MdTabsModule, MdToolbarModule, MdTooltipModule, @@ -45,11 +46,11 @@ import 'rxjs/add/observable/of'; }) export class KitchenSink { - /** List of columns for the CDK table. */ - cdkTableColumns = ['userId']; + /** List of columns for the CDK and Material table. */ + tableColumns = ['userId']; - /** Data source for the CDK table. */ - cdkTableDataSource: DataSource = { + /** Data source for the CDK and Material table. */ + tableDataSource: DataSource = { connect: () => Observable.of([ { userId: 1 }, { userId: 2 } @@ -93,6 +94,7 @@ export class KitchenSink { MdTooltipModule, MdExpansionModule, MdSortModule, + MdTableModule, // CDK Modules CdkTableModule