inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

#46 Fixed build error

Browse Source
This commit is contained in:
mauriziovitale84
2016-05-13 10:00:12 +01:00
parent 51b940b03e
commit f97d31f530
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts
View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { Component, ViewChild, ElementRef, Input } from 'angular2/core';
import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from 'angular2/core';
import { UploadService } from '../services/upload.service';
import { FileModel } from '../models/file.model';
import { FileUploadingDialogComponent } from './file-uploading-dialog.component';
@@ -55,6 +55,9 @@ export class UploadDragAreaComponent {
@Input()
uploaddirectory: string = '';
@Output()
onSuccess = new EventEmitter();
constructor(public el: ElementRef) {
console.log('UploadComponent constructor', el);
@@ -79,7 +82,7 @@ export class UploadDragAreaComponent {
onFilesDropped(files: File[]): void {
if (files.length) {
this._uploaderService.addToQueue(files);
this._uploaderService.uploadFilesInTheQueue(this.uploaddirectory);
this._uploaderService.uploadFilesInTheQueue(this.uploaddirectory, this.onSuccess);
this.filesUploadingList = this._uploaderService.getQueue();
if (this.showUploadDialog) {
this._showDialog();

6
ng2-components/ng2-alfresco-upload/src/services/upload.service.ts
View File

@@ -72,7 +72,7 @@ export class UploadService {
/**
* Pick all the files in the queue that are not been uploaded yet and upload it into the directory folder.
*/
public uploadFilesInTheQueue(directory: string, elementEmit: EventEmitter): void {
public uploadFilesInTheQueue(directory: string, elementEmit: EventEmitter<any>): void {
let filesToUpload = this._queue.filter((uploadingFileModel) => {
return !uploadingFileModel.uploading && !uploadingFileModel.done && !uploadingFileModel.abort && !uploadingFileModel.error;
});
@@ -85,7 +85,7 @@ export class UploadService {
/**
* The method create a new XMLHttpRequest instance if doesn't exist
*/
private _configureXMLHttpRequest(uploadingFileModel: any, elementEmit: EventEmitter) {
private _configureXMLHttpRequest(uploadingFileModel: any, elementEmit: EventEmitter<any>) {
if (this._xmlHttpRequest === undefined) {
this._xmlHttpRequest = new XMLHttpRequest();
this._xmlHttpRequest.upload.onprogress = (e) => {
@@ -128,7 +128,7 @@ export class UploadService {
* @param {FileModel} - files to be uploaded.
*
*/
uploadFile(uploadingFileModel: FileModel, directory: string, elementEmit: EventEmitter): void {
uploadFile(uploadingFileModel: FileModel, directory: string, elementEmit: EventEmitter<any>): void {
let form = new FormData();
form.append(this._fieldName, uploadingFileModel.file, uploadingFileModel.name);
Object.keys(this._formFields).forEach((key: any) => {

4
ng2-components/ng2-alfresco-upload/test/components/upload-button.component.spec.ts
View File

@@ -18,9 +18,9 @@
import { TEST_BROWSER_PLATFORM_PROVIDERS, TEST_BROWSER_APPLICATION_PROVIDERS } from 'angular2/platform/testing/browser';
import { it, describe, expect, injectAsync, beforeEachProviders, TestComponentBuilder, setBaseTestProviders } from 'angular2/testing';
import { Component, provide, Injector } from 'angular2/core';
import { provide } from 'angular2/core';
import { UploadButtonComponent } from '../../src/components/upload-button.component';
import { TranslateService, LangChangeEvent } from 'ng2-translate/ng2-translate';
import { TranslateService } from 'ng2-translate/ng2-translate';
import { TranslationMock } from '../assets/translation.service.mock';
describe('AlfrescoUploadButton', () => {

8
ng2-components/ng2-alfresco-upload/test/services/upload.service.spec.ts
View File

@@ -81,7 +81,7 @@ describe('AlfrescoUploadService', () => {
service.setXMLHttpRequest(xhr);
let filesFake = [{name: 'fake-name', size: 10}];
service.addToQueue(filesFake);
service.uploadFilesInTheQueue('');
service.uploadFilesInTheQueue('', null);
expect(jasmine.Ajax.requests.mostRecent().url).toBe('/some/cool/url');
expect(doneFn).not.toHaveBeenCalled();
jasmine.Ajax.requests.mostRecent().respondWith({
@@ -96,7 +96,7 @@ describe('AlfrescoUploadService', () => {
service.setXMLHttpRequest(xhr);
let filesFake = [{name: 'fake-name', size: 10}];
service.addToQueue(filesFake);
service.uploadFilesInTheQueue('');
service.uploadFilesInTheQueue('', null);
expect(jasmine.Ajax.requests.mostRecent().url).toBe('/some/cool/url');
expect(doneFn).not.toHaveBeenCalled();
jasmine.Ajax.requests.mostRecent().respondWith({
@@ -111,7 +111,7 @@ describe('AlfrescoUploadService', () => {
service.setXMLHttpRequest(xhr);
let filesFake = [{name: 'fake-name', size: 10}];
service.addToQueue(filesFake);
service.uploadFilesInTheQueue('');
service.uploadFilesInTheQueue('', null);
let file = service.getQueue();
file[0].setAbort();
expect(xhr.abort).toHaveBeenCalled();
@@ -122,7 +122,7 @@ describe('AlfrescoUploadService', () => {
let filesFake = {name: 'fake-name', size: 10};
let uploadingFileModel = new FileModel(filesFake);
service.uploadFile(uploadingFileModel);
service.uploadFile(uploadingFileModel, '', null);
expect(jasmine.Ajax.requests.mostRecent().url).toBe('/some/cool/url');
expect(doneFn).not.toHaveBeenCalled();