Merge branch 'master' of https://github.com/primefaces/primereact

primefaces · Jun 4, 2018 · 1fa1dec · 1fa1dec
2 parents 0515271 + f189bf5
commit 1fa1dec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/datatable/DataTable.js b/src/components/datatable/DataTable.js
@@ -712,7 +712,7 @@ export class DataTable extends Component {
         });
 
         if(window.navigator.msSaveOrOpenBlob) {
-            navigator.msSaveOrOpenBlob(blob, this.exportFilename + '.csv');
+            navigator.msSaveOrOpenBlob(blob, this.props.exportFilename + '.csv');
         }
         else {
             let link = document.createElement("a");

diff --git a/src/components/listbox/ListBox.d.ts b/src/components/listbox/ListBox.d.ts
@@ -4,6 +4,7 @@ interface ListBoxProps {
     id?: string,
     value?: any,
     options?: Array<any>,
+    optionLabel?: string,
     itemTemplate?(): void,
     style?: object,
     listStyle?: object,
@@ -15,4 +16,4 @@ interface ListBoxProps {
     onChange?(e: {originalEvent: Event, value: any}): void;
 }
 
-export class ListBox extends React.Component<ListBoxProps,any> {}
+export class ListBox extends React.Component<ListBoxProps,any> {}