Merged 579

ertugrultas · Dec 20, 2016 · 4a088e7 · 4a088e7
1 parent f22714a
commit 4a088e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/components/datatable/datatable.ts b/components/datatable/datatable.ts
@@ -447,6 +447,8 @@ export class DataTable implements AfterViewChecked,AfterViewInit,AfterContentIni
 
     @ContentChild(FooterColumnGroup) footerColumnGroup: FooterColumnGroup;
 
+    @Input() public filters: {[s: string]: FilterMetadata;} = {};
+
     public dataToRender: any[];
 
     public first: number = 0;
@@ -455,8 +457,6 @@ export class DataTable implements AfterViewChecked,AfterViewInit,AfterContentIni
 
     public filterTimeout: any;
 
-    public filters: {[s: string]: FilterMetadata;} = {};
-
     public filteredValue: any[];
 
     public columns: Column[];
@@ -536,14 +536,7 @@ export class DataTable implements AfterViewChecked,AfterViewInit,AfterContentIni
 
     ngOnInit() {
         if(this.lazy) {
-            this.onLazyLoad.emit({
-                first: this.first,
-                rows: this.rows,
-                sortField: this.sortField,
-                sortOrder: this.sortOrder,
-                filters: null,
-                multiSortMeta: this.multiSortMeta
-            });
+            this.onLazyLoad..emit(this.createLazyLoadMetadata());
         }
     }
 

diff --git a/showcase/demo/datatable/datatabledemo.html b/showcase/demo/datatable/datatabledemo.html
@@ -1090,6 +1090,12 @@ <h3>Attributes</h3>
                             <td>false</td>
                             <td>Adds hover effect to rows without the need for selectionMode.</td>
                         </tr>
+                        <tr>
+                            <td>filters</td>
+                            <td>array</td>
+                            <td>null</td>
+                            <td>An array of FilterMetadata objects to provide external filters.</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>