From 68306ab6fc0cb67c43732787da3ad52fc0732b21 Mon Sep 17 00:00:00 2001 From: buchslava Date: Thu, 15 Oct 2015 19:32:07 +0300 Subject: [PATCH] Updated: prettify the solution --- components/file-upload/file-drop.ts | 3 +-- components/file-upload/file-select.ts | 3 +-- components/index.ts | 1 + demo/components/file-upload/simple-demo.html | 8 ++++---- demo/components/file-upload/simple-demo.ts | 7 +++---- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/components/file-upload/file-drop.ts b/components/file-upload/file-drop.ts index 50ce2b2..62f1c72 100644 --- a/components/file-upload/file-drop.ts +++ b/components/file-upload/file-drop.ts @@ -8,7 +8,7 @@ import {FileUploader} from './file-uploader'; @Directive({ selector: '[ng2-file-drop]', - properties: ['config: ng2FileDrop', 'uploader'], + properties: ['uploader'], events: ['fileOver'], host: { '(drop)': 'onDrop($event)', @@ -18,7 +18,6 @@ import {FileUploader} from './file-uploader'; }) export class FileDrop { public uploader:FileUploader; - public config:any = {}; private fileOver:EventEmitter = new EventEmitter(); constructor(private element:ElementRef) { diff --git a/components/file-upload/file-select.ts b/components/file-upload/file-select.ts index ab368a6..f792743 100644 --- a/components/file-upload/file-select.ts +++ b/components/file-upload/file-select.ts @@ -10,14 +10,13 @@ import {FileUploader} from './file-uploader'; @Directive({ selector: '[ng2-file-select]', - properties: ['config: ng2FileSelect', 'uploader'], + properties: ['uploader'], host: { '(change)': 'onChange()' } }) export class FileSelect { public uploader:FileUploader; - public config:any = {}; constructor(private element:ElementRef) { } diff --git a/components/index.ts b/components/index.ts index 2209aa5..e84b61f 100644 --- a/components/index.ts +++ b/components/index.ts @@ -2,4 +2,5 @@ export * from './file-upload/file-select'; export * from './file-upload/file-drop'; +export * from './file-upload/file-uploader'; diff --git a/demo/components/file-upload/simple-demo.html b/demo/components/file-upload/simple-demo.html index 1196d5a..01f00a4 100644 --- a/demo/components/file-upload/simple-demo.html +++ b/demo/components/file-upload/simple-demo.html @@ -20,7 +20,7 @@

Select files

-
-
Multiple -
+
Single - +
diff --git a/demo/components/file-upload/simple-demo.ts b/demo/components/file-upload/simple-demo.ts index efaa3be..0d71093 100644 --- a/demo/components/file-upload/simple-demo.ts +++ b/demo/components/file-upload/simple-demo.ts @@ -5,14 +5,13 @@ import { CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle } from 'angular2/angular2'; -import {FileSelect, FileDrop} from '../../../components/index'; -import {FileUploader} from '../../../components/file-upload/file-uploader'; +import {FileSelect, FileDrop, FileUploader} from '../../../components/index'; // webpack html imports let template = require('./simple-demo.html'); -// const URL = '/api/'; -const URL = 'https://evening-anchorage-3159.herokuapp.com/api/'; +const URL = '/api/'; +// const URL = 'https://evening-anchorage-3159.herokuapp.com/api/'; @Component({ selector: 'simple-demo'