From bd1100c33babf7634ffb7b18cf2f9cca3b04775e Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Wed, 15 Jun 2016 13:57:47 +0100 Subject: [PATCH] Improve 'ng2-alfresco-core' imports --- demo-shell-ng2/app/app.component.ts | 4 ++-- demo-shell-ng2/app/components/files/files.component.ts | 8 ++++---- .../app/components/search/search-bar.component.ts | 2 +- demo-shell-ng2/app/main.ts | 2 +- demo-shell-ng2/systemjs.config.js | 4 ++-- ng2-components/ng2-alfresco-core/.gitignore | 5 ++--- .../ng2-alfresco-core/{ng2-alfresco-core.ts => index.ts} | 0 ng2-components/ng2-alfresco-core/package.json | 2 ++ ng2-components/ng2-alfresco-documentlist/demo/src/main.ts | 2 +- .../src/assets/alfresco.service.mock.ts | 2 +- .../src/components/document-list.ts | 2 +- .../src/services/alfresco.service.ts | 2 +- .../src/services/document-actions.service.ts | 2 +- ng2-components/ng2-alfresco-login/demo/src/main.ts | 2 +- .../src/assets/authentication.service.mock.ts | 2 +- .../src/components/alfresco-login.component.ts | 2 +- ng2-components/ng2-alfresco-search/demo/src/main.ts | 2 +- .../src/assets/alfresco.service.mock.ts | 2 +- .../components/alfresco-search-autocomplete.component.ts | 2 +- .../src/components/alfresco-search-control.component.ts | 2 +- .../src/components/alfresco-search.component.ts | 2 +- .../ng2-alfresco-search/src/services/alfresco.service.ts | 2 +- ng2-components/ng2-alfresco-upload/demo/src/main.ts | 2 +- .../components/file-uploading-dialog.component.spec.ts | 2 +- .../src/components/file-uploading-dialog.component.ts | 2 +- .../src/components/file-uploading-list.component.ts | 2 +- .../src/components/upload-button.component.spec.ts | 2 +- .../src/components/upload-button.component.ts | 2 +- .../src/components/upload-drag-area.component.ts | 2 +- .../ng2-alfresco-upload/src/services/upload.service.ts | 2 +- 30 files changed, 36 insertions(+), 35 deletions(-) rename ng2-components/ng2-alfresco-core/{ng2-alfresco-core.ts => index.ts} (100%) diff --git a/demo-shell-ng2/app/app.component.ts b/demo-shell-ng2/app/app.component.ts index 7cc2dc47cc..4e3adfa794 100644 --- a/demo-shell-ng2/app/app.component.ts +++ b/demo-shell-ng2/app/app.component.ts @@ -17,15 +17,15 @@ import { Component } from '@angular/core'; import { Router, RouteConfig, ROUTER_DIRECTIVES } from '@angular/router-deprecated'; -import { MDL } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; import { FilesComponent } from './components/files/files.component'; import { + MDL, AlfrescoSettingsService, AlfrescoTranslationService, AlfrescoPipeTranslate, AlfrescoAuthenticationService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; import { UploadButtonComponent } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload'; import { DataTableDemoComponent } from './components/datatable/datatable-demo.component'; import { SearchComponent } from './components/search/search.component'; diff --git a/demo-shell-ng2/app/components/files/files.component.ts b/demo-shell-ng2/app/components/files/files.component.ts index e9b4489aa4..0683db7790 100644 --- a/demo-shell-ng2/app/components/files/files.component.ts +++ b/demo-shell-ng2/app/components/files/files.component.ts @@ -23,11 +23,11 @@ import { } from 'ng2-alfresco-documentlist/dist/ng2-alfresco-documentlist'; import { MDL, - AlfrescoContentService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; -import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; + AlfrescoContentService, + CONTEXT_MENU_DIRECTIVES, + AlfrescoPipeTranslate +} from 'ng2-alfresco-core'; import { ALFRESCO_ULPOAD_COMPONENTS } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload'; -import { AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer/dist/ng2-alfresco-viewer'; declare let __moduleName: string; diff --git a/demo-shell-ng2/app/components/search/search-bar.component.ts b/demo-shell-ng2/app/components/search/search-bar.component.ts index fdd9d58063..6afe6d8b8c 100644 --- a/demo-shell-ng2/app/components/search/search-bar.component.ts +++ b/demo-shell-ng2/app/components/search/search-bar.component.ts @@ -22,7 +22,7 @@ import { VIEWERCOMPONENT } from 'ng2-alfresco-viewer/dist/ng2-alfresco-viewer'; import { AlfrescoAuthenticationService, AlfrescoContentService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; declare let __moduleName: string; diff --git a/demo-shell-ng2/app/main.ts b/demo-shell-ng2/app/main.ts index 37b3de6a06..32dccaa9ab 100644 --- a/demo-shell-ng2/app/main.ts +++ b/demo-shell-ng2/app/main.ts @@ -18,7 +18,7 @@ import { bootstrap } from '@angular/platform-browser-dynamic'; import { ROUTER_PROVIDERS } from '@angular/router-deprecated'; import { HTTP_PROVIDERS } from '@angular/http'; -import { ALFRESCO_CORE_PROVIDERS } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { ALFRESCO_CORE_PROVIDERS } from 'ng2-alfresco-core'; import { UploadService } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload'; import { AppComponent } from './app.component'; diff --git a/demo-shell-ng2/systemjs.config.js b/demo-shell-ng2/systemjs.config.js index df0508421f..3d12a1d10e 100644 --- a/demo-shell-ng2/systemjs.config.js +++ b/demo-shell-ng2/systemjs.config.js @@ -11,7 +11,7 @@ 'rxjs': 'node_modules/rxjs', 'ng2-translate': 'node_modules/ng2-translate', - 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core', + 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist', 'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable/dist', 'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist', 'ng2-alfresco-login': 'node_modules/ng2-alfresco-login', @@ -26,7 +26,7 @@ 'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' }, 'ng2-translate': { defaultExtension: 'js' }, - 'ng2-alfresco-core': {defaultExtension: 'js'}, + 'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js'}, 'ng2-alfresco-datatable': { main: 'index.js', defaultExtension: 'js'}, 'ng2-alfresco-documentlist': {defaultExtension: 'js'}, 'ng2-alfresco-login': {defaultExtension: 'js'}, diff --git a/ng2-components/ng2-alfresco-core/.gitignore b/ng2-components/ng2-alfresco-core/.gitignore index 0398da9d4a..bf980cac93 100644 --- a/ng2-components/ng2-alfresco-core/.gitignore +++ b/ng2-components/ng2-alfresco-core/.gitignore @@ -1,6 +1,5 @@ npm-debug.log node_modules -jspm_packages .idea typings coverage @@ -11,6 +10,6 @@ src/**/*.d.ts demo/**/*.js demo/**/*.js.map demo/**/*.d.ts -ng2-alfresco-core.js -ng2-alfresco-core.js.map +index.js +index.map !systemjs.config.js diff --git a/ng2-components/ng2-alfresco-core/ng2-alfresco-core.ts b/ng2-components/ng2-alfresco-core/index.ts similarity index 100% rename from ng2-components/ng2-alfresco-core/ng2-alfresco-core.ts rename to ng2-components/ng2-alfresco-core/index.ts diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index c4bfeb741a..8c1b17efb8 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -25,6 +25,8 @@ "coverage": "npm run test && http-server -c-1 -o -p 9875 ./coverage/report", "prepublish": "npm run build" }, + "main": "./dist/index.js", + "typings": "./dist/index.d.ts", "repository": { "type": "git", "url": "https://github.com/Alfresco/dev-platform-webcomponents.git" diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts index 9468f92fd8..b04600ba6b 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts @@ -26,7 +26,7 @@ import { AlfrescoPipeTranslate, AlfrescoTranslationService, CONTEXT_MENU_DIRECTIVES -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; import { DOCUMENT_LIST_DIRECTIVES, diff --git a/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts index 5a37ff8720..dbeae24ba2 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts @@ -22,7 +22,7 @@ import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoContentService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; export class AlfrescoServiceMock extends AlfrescoService { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index b891823bd4..7bce23bf29 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -28,7 +28,7 @@ import { } from '@angular/core'; import { DatePipe } from '@angular/common'; import { Subject } from 'rxjs/Rx'; -import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core'; import { AlfrescoService } from './../services/alfresco.service'; import { MinimalNodeEntity, NodePaging } from './../models/document-library.model'; import { ContentActionModel } from './../models/content-action.model'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts index fca22e0f24..fd7d77142b 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts @@ -23,7 +23,7 @@ import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoContentService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; declare let AlfrescoApi: any; diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts index 6f11303c3f..eb30d1bd69 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts @@ -20,7 +20,7 @@ import {ContentActionHandler} from '../models/content-action.model'; import {AlfrescoService} from './alfresco.service'; import { AlfrescoContentService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; @Injectable() export class DocumentActionsService { diff --git a/ng2-components/ng2-alfresco-login/demo/src/main.ts b/ng2-components/ng2-alfresco-login/demo/src/main.ts index ede3a22404..2d30d2e237 100644 --- a/ng2-components/ng2-alfresco-login/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-login/demo/src/main.ts @@ -29,7 +29,7 @@ import { ALFRESCO_CORE_PROVIDERS, AlfrescoSettingsService, AlfrescoAuthenticationService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; @RouteConfig([ diff --git a/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts b/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts index 3b914091c1..4e261ad646 100644 --- a/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts +++ b/ng2-components/ng2-alfresco-login/src/assets/authentication.service.mock.ts @@ -17,7 +17,7 @@ import { Observable } from 'rxjs/Rx'; import { provide } from '@angular/core'; -import { AlfrescoAuthenticationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoAuthenticationService } from 'ng2-alfresco-core'; export class AuthenticationMock { diff --git a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts index d6a1757378..8dd91e1e99 100644 --- a/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts +++ b/ng2-components/ng2-alfresco-login/src/components/alfresco-login.component.ts @@ -22,7 +22,7 @@ import { AlfrescoTranslationService, AlfrescoPipeTranslate, AlfrescoAuthenticationService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; declare let componentHandler: any; declare let __moduleName: string; diff --git a/ng2-components/ng2-alfresco-search/demo/src/main.ts b/ng2-components/ng2-alfresco-search/demo/src/main.ts index 473d9eb407..240bc14f2d 100644 --- a/ng2-components/ng2-alfresco-search/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-search/demo/src/main.ts @@ -25,7 +25,7 @@ import { AlfrescoAuthenticationService, AlfrescoPipeTranslate, AlfrescoTranslationService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; import { ALFRESCO_SEARCH_PROVIDERS, diff --git a/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts b/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts index d7fd69df36..3ddef936fd 100644 --- a/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts +++ b/ng2-components/ng2-alfresco-search/src/assets/alfresco.service.mock.ts @@ -21,7 +21,7 @@ import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoContentService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; import {AlfrescoService} from './../../src/services/alfresco.service'; export class AlfrescoServiceMock extends AlfrescoService { diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts index c95f98cb97..9bf364f96c 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts @@ -26,7 +26,7 @@ import { } from '@angular/core'; import { AlfrescoService } from './../services/alfresco.service'; -import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core'; declare let __moduleName: string; diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts index 94d6dbd5e9..d10e959a05 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts @@ -18,7 +18,7 @@ import { Control, Validators } from '@angular/common'; import { Component, Input, Output, EventEmitter, AfterViewInit } from '@angular/core'; -import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component'; diff --git a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts index 6e0626ac49..9c83e74058 100644 --- a/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts +++ b/ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts @@ -19,7 +19,7 @@ import { Component, Input, Optional, OnChanges, OnInit } from '@angular/core'; import { RouteParams } from '@angular/router-deprecated'; import { AlfrescoService } from './../services/alfresco.service'; -import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core'; declare let __moduleName: string; diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts index bf63091c0b..72752faab1 100644 --- a/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts +++ b/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts @@ -22,7 +22,7 @@ import { AlfrescoSettingsService, AlfrescoAuthenticationService, AlfrescoContentService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; declare let AlfrescoApi: any; diff --git a/ng2-components/ng2-alfresco-upload/demo/src/main.ts b/ng2-components/ng2-alfresco-upload/demo/src/main.ts index 99a6327dd2..0cd0c96440 100644 --- a/ng2-components/ng2-alfresco-upload/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-upload/demo/src/main.ts @@ -22,7 +22,7 @@ import { ALFRESCO_CORE_PROVIDERS, AlfrescoSettingsService, AlfrescoAuthenticationService -} from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +} from 'ng2-alfresco-core'; import { ALFRESCO_ULPOAD_COMPONENTS, UploadService } from 'ng2-alfresco-upload/dist/ng2-alfresco-upload'; diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts index 7949ed91a6..92535da31a 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.spec.ts @@ -24,7 +24,7 @@ import { import { provide } from '@angular/core'; import { FileUploadingDialogComponent } from './file-uploading-dialog.component'; import { FileModel } from '../models/file.model'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { TranslationMock } from '../assets/translation.service.mock'; describe('FileUploadDialog', () => { diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts index ef251bcd0c..8fb22dcb28 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.ts @@ -18,7 +18,7 @@ import { Component, ChangeDetectorRef, OnInit } from '@angular/core'; import { FileModel } from '../models/file.model'; import { FileUploadingListComponent } from './file-uploading-list.component'; -import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core'; import { UploadService } from '../services/upload.service'; declare let __moduleName: string; diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts index e53a100ea0..bc023f5eb8 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-list.component.ts @@ -18,7 +18,7 @@ import { Component, ElementRef, Input } from '@angular/core'; import { FileModel } from '../models/file.model'; -import { AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoPipeTranslate } from 'ng2-alfresco-core'; declare let __moduleName: string; diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts index 09f2a85b9f..b78c52f559 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.spec.ts @@ -19,7 +19,7 @@ import { describe, expect, it, inject, beforeEachProviders } from '@angular/core import { TestComponentBuilder } from '@angular/compiler/testing'; import { provide } from '@angular/core'; import { UploadButtonComponent } from './upload-button.component'; -import { AlfrescoTranslationService } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { TranslationMock } from '../assets/translation.service.mock'; import { UploadServiceMock } from '../assets/upload.service.mock'; import { UploadService } from '../services/upload.service'; diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts index 5ac07ddde3..6d8378129e 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-button.component.ts @@ -19,7 +19,7 @@ import { Component, ViewChild, ElementRef, Input, Output, EventEmitter } from '@angular/core'; import { UploadService } from '../services/upload.service'; import { FileModel } from '../models/file.model'; -import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core'; import 'rxjs/Rx'; declare let componentHandler: any; diff --git a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts index 548fff22c9..9e2ab0728d 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts +++ b/ng2-components/ng2-alfresco-upload/src/components/upload-drag-area.component.ts @@ -18,7 +18,7 @@ import { Component, ViewChild, Input, Output, EventEmitter } from '@angular/core'; import { UploadService } from '../services/upload.service'; import { FileDraggableDirective } from '../directives/file-draggable.directive'; -import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoTranslationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core'; import { FileModel } from '../models/file.model'; declare let __moduleName: string; 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 099343fc24..b88c314a33 100644 --- a/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts +++ b/ng2-components/ng2-alfresco-upload/src/services/upload.service.ts @@ -20,7 +20,7 @@ import { EventEmitter, Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Observable'; import { Observer } from 'rxjs/Observer'; -import { AlfrescoSettingsService } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; +import { AlfrescoSettingsService } from 'ng2-alfresco-core'; import { FileModel } from '../models/file.model'; declare let AlfrescoApi: any;