mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-587] upgrade components to angular 4 (#1866)
[ADF-587] upgrade components to angular 4
This commit is contained in:
committed by
Eugenio Romano
parent
5ba1202292
commit
e29741d18d
@@ -16,6 +16,7 @@
|
||||
*/
|
||||
|
||||
import { NgModule, ModuleWithProviders } from '@angular/core';
|
||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { HttpModule, Http } from '@angular/http';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
@@ -86,6 +87,7 @@ export function createTranslateLoader(http: Http, logService: LogService) {
|
||||
FormsModule,
|
||||
ReactiveFormsModule,
|
||||
HttpModule,
|
||||
BrowserAnimationsModule,
|
||||
MaterialModule.forRoot(),
|
||||
TranslateModule.forRoot({
|
||||
provide: TranslateLoader,
|
||||
@@ -105,6 +107,7 @@ export function createTranslateLoader(http: Http, logService: LogService) {
|
||||
...ALFRESCO_CORE_PROVIDERS
|
||||
],
|
||||
exports: [
|
||||
BrowserAnimationsModule,
|
||||
CommonModule,
|
||||
FormsModule,
|
||||
MaterialModule,
|
||||
|
@@ -44,17 +44,18 @@
|
||||
"alfresco"
|
||||
],
|
||||
"dependencies": {
|
||||
"@angular/common": "2.4.7",
|
||||
"@angular/compiler": "2.4.7",
|
||||
"@angular/compiler-cli": "2.4.7",
|
||||
"@angular/core": "2.4.7",
|
||||
"@angular/forms": "2.4.7",
|
||||
"@angular/http": "2.4.7",
|
||||
"@angular/animations": "~4.0.0",
|
||||
"@angular/common": "~4.0.0",
|
||||
"@angular/compiler": "~4.0.0",
|
||||
"@angular/core": "~4.0.0",
|
||||
"@angular/forms": "~4.0.0",
|
||||
"@angular/http": "~4.0.0",
|
||||
"@angular/platform-browser": "~4.0.0",
|
||||
"@angular/platform-browser-dynamic": "~4.0.0",
|
||||
"@angular/router": "~4.0.0",
|
||||
"@angular/compiler-cli": "~4.0.0",
|
||||
|
||||
"@angular/material": "2.0.0-beta.1",
|
||||
"@angular/platform-browser": "2.4.7",
|
||||
"@angular/platform-browser-dynamic": "2.4.7",
|
||||
"@angular/router": "3.4.7",
|
||||
"@angular/upgrade": "2.4.7",
|
||||
"alfresco-js-api": "~1.4.0",
|
||||
"core-js": "2.4.1",
|
||||
"dialog-polyfill": "0.4.7",
|
||||
|
@@ -33,7 +33,7 @@ const mockBackendResponse = (connection: MockConnection, response: string) => {
|
||||
|
||||
describe('TranslateLoader', () => {
|
||||
let injector: Injector;
|
||||
let backend: MockBackend;
|
||||
let backend: any;
|
||||
let alfrescoTranslationService: AlfrescoTranslationService;
|
||||
let connection: MockConnection; // this will be set when a new connection is emitted from the backend.
|
||||
let customLoader;
|
||||
|
@@ -31,7 +31,7 @@ const mockBackendResponse = (connection: MockConnection, response: string) => {
|
||||
|
||||
describe('AlfrescoTranslationService', () => {
|
||||
let injector: Injector;
|
||||
let backend: MockBackend;
|
||||
let backend: any;
|
||||
let alfrescoTranslationService: AlfrescoTranslationService;
|
||||
let connection: MockConnection; // this will be set when a new connection is emitted from the backend.
|
||||
|
||||
|
@@ -15,6 +15,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { Component } from '@angular/core';
|
||||
import { NotificationService } from './notification.service';
|
||||
import { MdSnackBarModule } from '@angular/material';
|
||||
@@ -24,7 +25,10 @@ describe('NotificationService', () => {
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [MdSnackBarModule.forRoot()],
|
||||
imports: [
|
||||
BrowserAnimationsModule,
|
||||
MdSnackBarModule.forRoot()
|
||||
],
|
||||
declarations: [ComponentThatProvidesNotificationService],
|
||||
providers: [
|
||||
NotificationService
|
||||
|
Reference in New Issue
Block a user