fix(aot): make data-table template access only public variables (#472)

Teradata · Apr 3, 2017 · 4aa916c · 4aa916c
1 parent d996efe
commit 4aa916c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/src/platform/core/data-table/data-table.component.html b/src/platform/core/data-table/data-table.component.html
@@ -1,10 +1,10 @@
 <div class="mat-table-container" title>
   <table td-data-table
-         [class.mat-selectable]="_selectable">
-    <th td-data-table-column class="mat-checkbox-column" *ngIf="_selectable">
+         [class.mat-selectable]="isSelectable">
+    <th td-data-table-column class="mat-checkbox-column" *ngIf="isSelectable">
       <md-checkbox
         #checkBoxAll
-        *ngIf="_multiple"
+        *ngIf="isMultiple"
         [disabled]="!hasData"
         [checked]="areAllSelected() && hasData"
         (click)="selectAll(!checkBoxAll.checked)">
@@ -14,17 +14,17 @@
         *ngFor="let column of columns"
         [name]="column.name"
         [numeric]="column.numeric"
-        [active]="(column.sortable || _sortable) && column === _sortBy"
-        [sortable]="column.sortable ||  _sortable"
-        [sortOrder]="_sortOrder"
+        [active]="(column.sortable || isSortable) && column === sortByColumn"
+        [sortable]="column.sortable ||  isSortable"
+        [sortOrder]="sortOrderEnum"
         (sortChange)="handleSort(column)">
         <span [mdTooltip]="column.tooltip">{{column.label}}</span>
     </th>
     <tr td-data-table-row
-        [class.mat-selected]="_selectable && isRowSelected(row)"
-        *ngFor="let row of _data"
-        (click)="_selectable && select(row, !isRowSelected(row), $event)">
-      <td td-data-table-cell class="mat-checkbox-cell" *ngIf="_selectable">
+        [class.mat-selected]="isSelectable && isRowSelected(row)"
+        *ngFor="let row of data"
+        (click)="isSelectable && select(row, !isRowSelected(row), $event)">
+      <td td-data-table-cell class="mat-checkbox-cell" *ngIf="isSelectable">
         <md-pseudo-checkbox
           [state]="isRowSelected(row) ? 'checked' : 'unchecked'">
         </md-pseudo-checkbox>

diff --git a/src/platform/core/data-table/data-table.component.ts b/src/platform/core/data-table/data-table.component.ts
@@ -94,10 +94,13 @@ export class TdDataTableComponent implements ControlValueAccessor, AfterContentI
    * Sets the data to be rendered as rows.
    */
   @Input('data')
-  set data(data: Object[]) {
+  set data(data: any[]) {
     this._data = data;
     this.refresh();
   }
+  get data(): any[] {
+    return this._data;
+  }
 
   /**
    * columns?: ITdDataTableColumn[]
@@ -134,8 +137,11 @@ export class TdDataTableComponent implements ControlValueAccessor, AfterContentI
    * Defaults to 'false'
    */
   @Input('selectable')
-  set selectable(_selectable: string | boolean) {
-    this._selectable = _selectable !== '' ? (_selectable === 'true' || _selectable === true) : true;
+  set selectable(selectable: string | boolean) {
+    this._selectable = selectable !== '' ? (selectable === 'true' || selectable === true) : true;
+  }
+  get isSelectable(): boolean {
+    return this._selectable;
   }
 
   /**
@@ -147,6 +153,9 @@ export class TdDataTableComponent implements ControlValueAccessor, AfterContentI
   set multiple(multiple: string | boolean) {
     this._multiple = multiple !== '' ? (multiple === 'true' || multiple === true) : true;
   }
+  get isMultiple(): boolean {
+    return this._multiple;
+  }
 
   /**
    * sortable?: boolean
@@ -157,6 +166,9 @@ export class TdDataTableComponent implements ControlValueAccessor, AfterContentI
   set sortable(sortable: string | boolean) {
     this._sortable = sortable !== '' ? (sortable === 'true' || sortable === true) : true;
   }
+  get isSortable(): boolean {
+    return this._sortable;
+  }
 
   /**
    * sortBy?: string
@@ -174,6 +186,9 @@ export class TdDataTableComponent implements ControlValueAccessor, AfterContentI
 
     this._sortBy = column;
   }
+  get sortByColumn(): ITdDataTableColumn {
+    return this._sortBy;
+  }
 
   /**
    * sortOrder?: ['ASC' | 'DESC'] or TdDataTableSortingOrder
@@ -190,6 +205,9 @@ export class TdDataTableComponent implements ControlValueAccessor, AfterContentI
     this._sortOrder = sortOrder === 'ASC' ?
       TdDataTableSortingOrder.Ascending : TdDataTableSortingOrder.Descending;
   }
+  get sortOrderEnum(): TdDataTableSortingOrder {
+    return this._sortOrder;
+  }
 
   get hasData(): boolean {
     return this._data && this._data.length > 0;