diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts index d3a64b2333..f7e11259bd 100644 --- a/demo-shell-ng2/app/components/files/files.component.ts +++ b/demo-shell-ng2/app/components/files/files.component.ts @@ -23,7 +23,7 @@ import { DocumentActionsService } from 'ng2-alfresco-documentlist/ng2-alfresco-documentlist'; import {MDL} from 'ng2-alfresco-core/material'; -import {ALFRESCO_ULPOAD_COMPONENT, ALFRESCO_ULPOAD_PROVAIDERS} from 'ng2-alfresco-upload/ng2-alfresco-upload'; +import {ALFRESCO_ULPOAD_COMPONENT} from 'ng2-alfresco-upload/ng2-alfresco-upload'; declare let __moduleName:string; @@ -32,7 +32,7 @@ declare let __moduleName:string; selector: 'files-component', templateUrl: './files.component.html', directives: [DOCUMENT_LIST_DIRECTIVES, MDL, ALFRESCO_ULPOAD_COMPONENT], - providers: [DOCUMENT_LIST_PROVIDERS, ALFRESCO_ULPOAD_PROVAIDERS] + providers: [DOCUMENT_LIST_PROVIDERS] }) export class FilesComponent { breadcrumb: boolean = false; diff --git a/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.d.ts b/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.d.ts index a04dce6cbd..8bce0681c6 100644 --- a/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.d.ts +++ b/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.d.ts @@ -15,7 +15,6 @@ * limitations under the License. */ import { UploadDragAreaComponent } from './src/components/upload-drag-area.component'; -import { UploadService } from './src/services/upload.service'; import { FileSelectDirective } from './src/directives/file-select.directive'; import { FileDraggableDirective } from './src/directives/file-draggable.directive'; import { UploadButtonComponent } from './src/components/upload-button.component'; @@ -27,8 +26,6 @@ export * from './src/directives/file-draggable.directive'; declare var _default: { component: (typeof UploadDragAreaComponent | typeof UploadButtonComponent)[]; directives: (typeof FileSelectDirective | typeof FileDraggableDirective)[]; - providers: typeof UploadService[]; }; export default _default; export declare const ALFRESCO_ULPOAD_COMPONENT: [any]; -export declare const ALFRESCO_ULPOAD_PROVAIDERS: [any]; diff --git a/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.js b/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.js index 3f422b96b3..085e668abb 100644 --- a/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.js +++ b/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.js @@ -14,14 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -System.register(['./src/components/upload-drag-area.component', './src/services/upload.service', './src/directives/file-select.directive', './src/directives/file-draggable.directive', './src/components/upload-button.component'], function(exports_1, context_1) { +System.register(['./src/components/upload-drag-area.component', './src/directives/file-select.directive', './src/directives/file-draggable.directive', './src/components/upload-button.component', './src/services/upload.service'], function(exports_1, context_1) { "use strict"; var __moduleName = context_1 && context_1.id; - var upload_drag_area_component_1, upload_service_1, file_select_directive_1, file_draggable_directive_1, upload_button_component_1; - var ALFRESCO_ULPOAD_COMPONENT, ALFRESCO_ULPOAD_PROVAIDERS; + var upload_drag_area_component_1, file_select_directive_1, file_draggable_directive_1, upload_button_component_1; + var ALFRESCO_ULPOAD_COMPONENT; var exportedNames_1 = { - 'ALFRESCO_ULPOAD_COMPONENT': true, - 'ALFRESCO_ULPOAD_PROVAIDERS': true + 'ALFRESCO_ULPOAD_COMPONENT': true }; function exportStar_1(m) { var exports = {}; @@ -36,10 +35,6 @@ System.register(['./src/components/upload-drag-area.component', './src/services/ upload_drag_area_component_1 = upload_drag_area_component_1_1; exportStar_1(upload_drag_area_component_1_1); }, - function (upload_service_1_1) { - upload_service_1 = upload_service_1_1; - exportStar_1(upload_service_1_1); - }, function (file_select_directive_1_1) { file_select_directive_1 = file_select_directive_1_1; exportStar_1(file_select_directive_1_1); @@ -51,12 +46,14 @@ System.register(['./src/components/upload-drag-area.component', './src/services/ function (upload_button_component_1_1) { upload_button_component_1 = upload_button_component_1_1; exportStar_1(upload_button_component_1_1); + }, + function (upload_service_1_1) { + exportStar_1(upload_service_1_1); }], execute: function() { exports_1("default",{ component: [upload_drag_area_component_1.UploadDragAreaComponent, upload_button_component_1.UploadButtonComponent], - directives: [file_select_directive_1.FileSelectDirective, file_draggable_directive_1.FileDraggableDirective], - providers: [upload_service_1.UploadService] + directives: [file_select_directive_1.FileSelectDirective, file_draggable_directive_1.FileDraggableDirective] }); exports_1("ALFRESCO_ULPOAD_COMPONENT", ALFRESCO_ULPOAD_COMPONENT = [ upload_drag_area_component_1.UploadDragAreaComponent, @@ -64,9 +61,6 @@ System.register(['./src/components/upload-drag-area.component', './src/services/ file_select_directive_1.FileSelectDirective, file_draggable_directive_1.FileDraggableDirective ]); - exports_1("ALFRESCO_ULPOAD_PROVAIDERS", ALFRESCO_ULPOAD_PROVAIDERS = [ - upload_service_1.UploadService - ]); } } }); diff --git a/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.js.map b/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.js.map index 58f2ae5600..4303c072bb 100644 --- a/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.js.map +++ b/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.js.map @@ -1 +1 @@ -{"version":3,"file":"ng2-alfresco-upload.js","sourceRoot":"","sources":["ng2-alfresco-upload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;QAoBU,yBAAyB,EAOzB,0BAA0B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAbvC,oBAAe;gBACX,SAAS,EAAE,CAAC,oDAAuB,EAAE,+CAAqB,CAAC;gBAC3D,UAAU,EAAE,CAAC,2CAAmB,EAAE,iDAAsB,CAAC;gBACzD,SAAS,EAAE,CAAC,8BAAa,CAAC;aAC7B,EAAA;YAEY,uCAAA,yBAAyB,GAAU;gBAC5C,oDAAuB;gBACvB,+CAAqB;gBACrB,2CAAmB;gBACnB,iDAAsB;aACzB,CAAA,CAAC;YAEW,wCAAA,0BAA0B,GAAU;gBAC7C,8BAAa;aAChB,CAAA,CAAC"} \ No newline at end of file +{"version":3,"file":"ng2-alfresco-upload.js","sourceRoot":"","sources":["ng2-alfresco-upload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;;;;;QAkBU,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YALtC,oBAAe;gBACX,SAAS,EAAE,CAAC,oDAAuB,EAAE,+CAAqB,CAAC;gBAC3D,UAAU,EAAE,CAAC,2CAAmB,EAAE,iDAAsB,CAAC;aAC5D,EAAA;YAEY,uCAAA,yBAAyB,GAAU;gBAC5C,oDAAuB;gBACvB,+CAAqB;gBACrB,2CAAmB;gBACnB,iDAAsB;aACzB,CAAA,CAAC"} \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.ts b/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.ts index f0cf53f9df..4ebf9b8abc 100644 --- a/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.ts +++ b/ng2-components/ng2-alfresco-upload/ng2-alfresco-upload.ts @@ -16,7 +16,6 @@ */ import {UploadDragAreaComponent} from './src/components/upload-drag-area.component'; -import {UploadService} from './src/services/upload.service'; import {FileSelectDirective} from './src/directives/file-select.directive'; import {FileDraggableDirective} from './src/directives/file-draggable.directive'; import {UploadButtonComponent} from './src/components/upload-button.component'; @@ -29,8 +28,7 @@ export * from './src/directives/file-draggable.directive'; export default { component: [UploadDragAreaComponent, UploadButtonComponent], - directives: [FileSelectDirective, FileDraggableDirective], - providers: [UploadService] + directives: [FileSelectDirective, FileDraggableDirective] } export const ALFRESCO_ULPOAD_COMPONENT: [any] = [ @@ -39,7 +37,3 @@ export const ALFRESCO_ULPOAD_COMPONENT: [any] = [ FileSelectDirective, FileDraggableDirective ]; - -export const ALFRESCO_ULPOAD_PROVAIDERS: [any] = [ - UploadService -]; diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.js b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.js index 438d54ab76..51f12d52e0 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.js +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.js @@ -87,11 +87,11 @@ System.register(['angular2/core', '../services/upload.service', './file-uploadin this.fileUploadingDialogComponent.showDialog(); }; __decorate([ - core_1.ViewChild('undoNotificationBar'), + core_1.ViewChild('undoNotificationBar'), __metadata('design:type', Object) ], UploadButtonComponent.prototype, "undoNotificationBar", void 0); __decorate([ - core_1.ViewChild('fileUploadingDialog'), + core_1.ViewChild('fileUploadingDialog'), __metadata('design:type', file_uploading_dialog_component_1.FileUploadingDialogComponent) ], UploadButtonComponent.prototype, "fileUploadingDialogComponent", void 0); UploadButtonComponent = __decorate([ @@ -101,7 +101,7 @@ System.register(['angular2/core', '../services/upload.service', './file-uploadin directives: [file_select_directive_1.FileSelectDirective, file_uploading_dialog_component_1.FileUploadingDialogComponent], templateUrl: './upload-button.component.html', styleUrls: ['./upload-button.component.css'] - }), + }), __metadata('design:paramtypes', [core_1.ElementRef]) ], UploadButtonComponent); return UploadButtonComponent; diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.js b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.js index 86f65e81e2..9e98236e9d 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.js +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.js @@ -71,7 +71,7 @@ System.register(['angular2/core', '../services/upload.service', './file-uploadin this.fileUploadingDialogComponent.showDialog(); }; __decorate([ - core_1.ViewChild('fileUploadingDialog'), + core_1.ViewChild('fileUploadingDialog'), __metadata('design:type', file_uploading_dialog_component_1.FileUploadingDialogComponent) ], UploadDragAreaComponent.prototype, "fileUploadingDialogComponent", void 0); UploadDragAreaComponent = __decorate([ @@ -81,7 +81,7 @@ System.register(['angular2/core', '../services/upload.service', './file-uploadin directives: [file_draggable_directive_1.FileDraggableDirective, file_uploading_dialog_component_1.FileUploadingDialogComponent], templateUrl: './upload-drag-area.component.html', styleUrls: ['./upload-drag-area.component.css'] - }), + }), __metadata('design:paramtypes', [core_1.ElementRef]) ], UploadDragAreaComponent); return UploadDragAreaComponent; diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.d.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.d.ts index 218967923e..69505bc655 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.d.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.d.ts @@ -1,5 +1,22 @@ +/** + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ import { FileModel } from '../models/file.model'; export declare class UploadService { + private options; private _url; private _method; private _authTokenPrefix; @@ -8,7 +25,7 @@ export declare class UploadService { private _formFields; private _withCredentials; _queue: FileModel[]; - constructor(); + constructor(options: any); addToQueue(files: any[]): FileModel[]; private _uploadFilesInTheQueue(); uploadFile(uploadingFileModel: any): void; diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.js b/ng2-components/ng2-alfresco-upload/src/services/upload.service.js index c2c900b20b..ad39a6889b 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.js +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.js @@ -14,37 +14,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -System.register(['angular2/core', '../models/file.model'], function(exports_1, context_1) { +System.register(['../models/file.model'], function(exports_1, context_1) { "use strict"; var __moduleName = context_1 && context_1.id; - var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; - }; - var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); - }; - var core_1, file_model_1; + var file_model_1; var UploadService; return { setters:[ - function (core_1_1) { - core_1 = core_1_1; - }, function (file_model_1_1) { file_model_1 = file_model_1_1; }], execute: function() { UploadService = (function () { - function UploadService() { + function UploadService(options) { + this.options = options; this._method = 'POST'; this._authTokenPrefix = 'Basic'; this._authToken = undefined; this._fieldName = 'file'; this._formFields = {}; this._queue = []; + console.log('UploadService constructor'); + this._withCredentials = options.withCredentials != null ? options.withCredentials : this._withCredentials; + this._url = options.url != null ? options.url : this._url; + this._authTokenPrefix = options.authTokenPrefix != null ? options.authTokenPrefix : this._authTokenPrefix; + this._authToken = options.authToken != null ? options.authToken : this._authToken; + this._fieldName = options.fieldName != null ? options.fieldName : this._fieldName; + this._formFields = options.formFields != null ? options.formFields : this._formFields; } UploadService.prototype.addToQueue = function (files) { var latestFilesAdded = []; @@ -113,10 +109,6 @@ System.register(['angular2/core', '../models/file.model'], function(exports_1, c UploadService.prototype._isFile = function (file) { return file !== null && (file instanceof Blob || (file.name && file.size)); }; - UploadService = __decorate([ - core_1.Injectable(), - __metadata('design:paramtypes', []) - ], UploadService); return UploadService; }()); exports_1("UploadService", UploadService); diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.js.map b/ng2-components/ng2-alfresco-upload/src/services/upload.service.js.map index 864f320724..f8d55c4e80 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.js.map +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.js.map @@ -1 +1 @@ -{"version":3,"file":"upload.service.js","sourceRoot":"","sources":["upload.service.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"upload.service.js","sourceRoot":"","sources":["upload.service.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts index cc7e8d813a..c7218dea73 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -16,11 +16,9 @@ */ -import {Injectable} from 'angular2/core'; import {FileModel} from '../models/file.model'; -@Injectable() export class UploadService { private _url:string; private _method:string = 'POST'; @@ -32,8 +30,6 @@ export class UploadService { _queue:FileModel[] = []; - constructor(){} - constructor(private options:any) { console.log('UploadService constructor');