Merge branch 'master' into issue-163-light-style-dropdown

Author: zvonimirfras

src/notification/notification-display.service.ts

@@ -11,9 +11,11 @@ export class NotificationDisplayService {
 	 * Programatically closes notification based on `notificationRef`.	 *
 	 */
 	close(notificationRef: any) {
-		setTimeout(() => {
-			this.applicationRef.detachView(notificationRef.hostView);
-			notificationRef.destroy();
-		}, 200);
+		if (notificationRef.hostView) {
+			setTimeout( () => {
+				this.applicationRef.detachView(notificationRef.hostView);
+				notificationRef.destroy();
+			}, 200);
+		}
 	}
 }

src/table/table-model.class.spec.ts

@@ -605,4 +605,20 @@ describe("Table", () => {
 		expect(tableModel.header[2].data).toEqual("h3");
 		expect(tableModel.header.length).toEqual(3);
 	});
+
+	it("should preserve header if data is emptied", () => {
+		let tableModel  = new TableModel();
+		tableModel.header = [
+			new TableHeaderItem({data: "h1"}), new TableHeaderItem({data: "h2"}), new TableHeaderItem({data: "h3"})
+		];
+		tableModel.data = [
+			[new TableItem({data: "A"}), new TableItem({data: "B"}), new TableItem({data: "C"})],
+			[new TableItem({data: "D"}), new TableItem({data: "E"}), new TableItem({data: "F"})]
+		];
+		tableModel.data = [[]];
+		expect(tableModel.header.length).toEqual(3);
+		expect(tableModel.header[0].data).toEqual("h1");
+		expect(tableModel.header[1].data).toEqual("h2");
+		expect(tableModel.header[2].data).toEqual("h3");
+	});
 });

src/table/table-model.class.ts

@@ -29,7 +29,7 @@ export class TableModel implements PaginationModel {
 		this.rowsContext = new Array<string>(this._data.length);
 
 		// only create a fresh header if necessary (header doesn't exist or differs in length)
-		if (this.header == null || this.header.length !== this._data[0].length) {
+		if (this.header == null || (this.header.length !== this._data[0].length && this._data[0].length > 0)) {
 			let header = new Array<TableHeaderItem>();
 			for (let i = 0; i < this._data[0].length; i++) {
 				header.push(new TableHeaderItem());