dc/ng2-file-upload
4
0
Fork 0
Code Issues 395 Pull Requests 27 Packages Projects Releases 4 Wiki Activity

Merge branch 'patch-1' of git://github.com/rickblokdijk/ng2-file-upload into rickblokdijk-patch-1

Browse Source 
Conflicts:
	components/file-upload/file-item.class.ts
This commit is contained in:
Dmitriy Shekhovtsov
2016-05-11 19:15:06 +03:00
parent d2f60894bb 8db149ffe5
commit 6538dfa18b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/file-upload/file-item.class.ts
View File

@@ -1,3 +1,5 @@
import {NgZone} from '@angular/core';
import {FileLikeObject} from './file-like-object.class'; import {FileLikeObject} from './file-like-object.class';
import {FileUploader} from './file-uploader.class'; import {FileUploader} from './file-uploader.class';
@@ -18,6 +20,7 @@ export class FileItem {
public isError:boolean = false; public isError:boolean = false;
public progress:number = 0; public progress:number = 0;
public index:number = void 0; public index:number = void 0;
private _zone:NgZone;
private uploader:FileUploader; private uploader:FileUploader;
private some:any; private some:any;
@@ -30,6 +33,7 @@ export class FileItem {
this.file = new FileLikeObject(some); this.file = new FileLikeObject(some);
this._file = some; this._file = some;
this.url = uploader.url; this.url = uploader.url;
this._zone = new NgZone({ enableLongStackTrace: false });
} }
public upload():void { public upload():void {
@@ -85,7 +89,9 @@ export class FileItem {
} }
public _onProgress(progress:number):void { public _onProgress(progress:number):void {
this._zone.run(() => {
this.progress = progress; this.progress = progress;
});
this.onProgress(progress); this.onProgress(progress);
} }