Merge branch 'master' into issue#276

Author: zvonimirfras

.storybook/config.js

@@ -27,8 +27,8 @@ addDecorator(
 );
 
 // load global styles
-require("!style-loader!css-loader!sass-loader!./preview.scss");
-require("!style-loader!css-loader!sass-loader!./preview-experimental.scss");
+require("!style-loader!css-loader!postcss-loader!sass-loader!./preview.scss");
+require("!style-loader!css-loader!postcss-loader!sass-loader!./preview-experimental.scss");
 
 require("../src/index.stories");
 // automatically import all files ending in *.stories.ts

src/file-uploader/file-uploader.component.ts

@@ -144,6 +144,9 @@ export class FileUploader implements OnInit {
 
 	onFilesAdded() {
 		const files = this.fileInput.nativeElement.files;
+		if (!this.multiple) {
+			this.files.clear();
+		}
 		for (let file of files) {
 			const fileItem: FileItem = {
 				uploaded: false,

src/file-uploader/file-uploader.stories.ts

@@ -35,7 +35,7 @@ class FileUploaderStory {
 	static notificationCount = 0;
 
 	@Input() notificationId = `notification-${FileUploaderStory.notificationCount}`;
-	@Input() files: any;
+	@Input() files = new Set();
 	@Input() title;
 	@Input() description;
 	@Input() buttonText;

src/pagination/pagination.component.ts

@@ -23,7 +23,7 @@ import { ExperimentalService } from "./../experimental.module";
  *
  * ```typescript
  * selectPage(page) {
- * 	// ... your code to laod the page goes here
+ * 	// ... your code to load the page goes here
  *
  * 	this.model.currentPage = page;
  *
@@ -279,7 +279,6 @@ export class Pagination {
 	 * `PaginationModel` with the information about pages you're controlling.
 	 *
 	 * @type {Model}
-	 * @memberof Pagination
 	 */
 	@Input() model: PaginationModel;
 
@@ -327,32 +326,28 @@ export class Pagination {
 	 *
 	 * You should tie into this and update `model.currentPage` once the fresh
 	 * data is finally loaded.
-	 *
-	 * @memberof Pagination
 	 */
 	@Output() selectPage = new EventEmitter<number>();
 
 	get itemsPerPage() {
 		return this.model.pageLength;
 	}
 	set itemsPerPage(value) {
-		this.model.pageLength = value;
+		this.model.pageLength = Number(value);
 		this.currentPage = 1; // reset page
 	}
 
 	get currentPage() {
 		return this.model.currentPage;
 	}
 	set currentPage(value) {
+		value = Number(value);
 		// emits the value to allow the user to update current page
 		// in the model once the page is loaded
 		this.selectPage.emit(value);
 	}
 	/**
 	 * The last page number to display in the pagination view.
-	 *
-	 * @returns {number}
-	 * @memberof Pagination
 	 */
 	get lastPage(): number {
 		const last = Math.ceil(this.model.totalDataLength / this.model.pageLength);
@@ -371,19 +366,13 @@ export class Pagination {
 
 	/**
 	 * The previous page number to navigate to, from the current page.
-	 *
-	 * @returns {number}
-	 * @memberof Pagination
 	 */
 	get previousPage(): number {
 		return this.currentPage <= 1 ? 1 : this.currentPage - 1;
 	}
 
 	/**
 	 * The next page number to navigate to, from the current page.
-	 *
-	 * @returns {number}
-	 * @memberof Pagination
 	 */
 	get nextPage(): number {
 		const lastPage = this.lastPage;
@@ -412,12 +401,7 @@ export class Pagination {
 	/**
 	 * Generates a list of numbers. (Python function)
 	 * Used to display the correct pagination controls.
-	 *
-	 * @param {number} stop
-	 * @param {number} [start=0]
-	 * @param {number} [step=1]
 	 * @returns {array}
-	 * @memberof Pagination
 	 */
 	range(stop: number, start = 0, step = 1) {
 		return range(stop, start, step);