Merge pull request #5 from matthewdenobrega/master

Upgraded to Angular2 2.0.0-alpha.46
This commit is contained in:
Dmitriy Shekhovtsov
2015-11-19 13:50:10 +02:00
4 changed files with 9 additions and 6 deletions

View File

@@ -7,4 +7,7 @@ logs
tsd.d.ts tsd.d.ts
typings typings
/node_modules
webpack.config.js webpack.config.js

View File

@@ -18,7 +18,7 @@ import {FileUploader} from './file-uploader';
}) })
export class FileDrop { export class FileDrop {
public uploader:FileUploader; public uploader:FileUploader;
private fileOver:EventEmitter = new EventEmitter(); private fileOver:EventEmitter<any> = new EventEmitter();
constructor(private element:ElementRef) { constructor(private element:ElementRef) {
} }

View File

@@ -77,7 +77,6 @@ export class FileUploader {
} }
this.queue.splice(index, 1); this.queue.splice(index, 1);
item._destroy();
this.progress = this._getTotalProgress(); this.progress = this._getTotalProgress();
} }

View File

@@ -28,11 +28,11 @@
"url": "https://github.com/valor-software/ng2-file-upload/issues" "url": "https://github.com/valor-software/ng2-file-upload/issues"
}, },
"homepage": "https://github.com/valor-software/ng2-file-upload#readme", "homepage": "https://github.com/valor-software/ng2-file-upload#readme",
"dependencies": { "peerDependencies": {
"angular2": "2.0.0-alpha.44", "angular2": "2.0.0-alpha.46",
"ng2-bootstrap": "0.44.3", "ng2-bootstrap": "0.46.0",
"reflect-metadata": "0.1.2", "reflect-metadata": "0.1.2",
"ts-loader": "0.5.6", "@reactivex/rxjs": "5.0.0-alpha.7",
"zone.js": "0.5.8" "zone.js": "0.5.8"
}, },
"devDependencies": { "devDependencies": {
@@ -58,6 +58,7 @@
"raw-loader": "0.5.1", "raw-loader": "0.5.1",
"require-dir": "0.3.0", "require-dir": "0.3.0",
"typescript": "1.6.2", "typescript": "1.6.2",
"ts-loader": "0.5.6",
"webpack": "1.12.2", "webpack": "1.12.2",
"webpack-dev-server": "1.12.1" "webpack-dev-server": "1.12.1"
}, },