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

#1471 rollback className change (#1472)

Browse Source
This commit is contained in:
Mario Romano
2017-01-16 11:49:43 +00:00
committed by Denys Vuika
parent 473241f792
commit 9655e51943
119 changed files with 356 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ng2-components/ng2-alfresco-search/demo/src/main.ts
View File

@@ -23,9 +23,9 @@ import { CoreModule, LogService } from 'ng2-alfresco-core';
import { SearchModule } from 'ng2-alfresco-search';
import {
SettingsService,
AuthService,
AlfrescoTranslateService
AlfrescoSettingsService,
AlfrescoAuthenticationService,
AlfrescoTranslationService
} from 'ng2-alfresco-core';
@Component({
@@ -54,9 +54,9 @@ class SearchDemo implements OnInit {
ecmHost: string = 'http://localhost:8080';
ticket: string;
constructor(private authService: AuthService,
private settingsService: SettingsService,
translation: AlfrescoTranslateService,
constructor(private authService: AlfrescoAuthenticationService,
private settingsService: AlfrescoSettingsService,
translation: AlfrescoTranslationService,
private logService: LogService) {
settingsService.ecmHost = this.ecmHost;

18
ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.spec.ts
View File

@@ -23,10 +23,10 @@ import { result, results, folderResult, noResult, errorJson } from './../assets/
import { AlfrescoSearchService } from '../services/alfresco-search.service';
import {
AlfrescoApiService,
SettingsService,
AuthService,
ContentService,
AlfrescoTranslateService,
AlfrescoSettingsService,
AlfrescoAuthenticationService,
AlfrescoContentService,
AlfrescoTranslationService,
CoreModule
} from 'ng2-alfresco-core';
@@ -48,12 +48,12 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
],
declarations: [ AlfrescoSearchAutocompleteComponent ], // declare the test component
providers: [
{provide: AlfrescoTranslateService, useClass: TranslationMock},
{provide: AlfrescoTranslationService, useClass: TranslationMock},
AlfrescoThumbnailService,
SettingsService,
AlfrescoSettingsService,
AlfrescoApiService,
AuthService,
ContentService,
AlfrescoAuthenticationService,
AlfrescoContentService,
AlfrescoSearchService
]
}).compileComponents().then(() => {
@@ -64,7 +64,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
}));
it('should setup i18n folder', () => {
let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService);
let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
spyOn(translationService, 'addTranslationFolder');
fixture.detectChanges();
expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');

4
ng2-components/ng2-alfresco-search/src/components/alfresco-search-autocomplete.component.ts
View File

@@ -16,7 +16,7 @@
*/
import { Component, ElementRef, EventEmitter, Input, OnInit, OnChanges, Output, ViewChild } from '@angular/core';
import { AlfrescoTranslateService } from 'ng2-alfresco-core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { MinimalNodeEntity } from 'alfresco-js-api';
import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service';
import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service';
@@ -71,7 +71,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', '');
constructor(private searchService: AlfrescoSearchService,
private translateService: AlfrescoTranslateService,
private translateService: AlfrescoTranslationService,
private thumbnailService: AlfrescoThumbnailService) {
}

18
ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.spec.ts
View File

@@ -22,11 +22,11 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi
import { TranslationMock } from './../assets/translation.service.mock';
import { result } from './../assets/alfresco-search.component.mock';
import {
SettingsService,
AlfrescoSettingsService,
AlfrescoApiService,
AuthService,
ContentService,
AlfrescoTranslateService,
AlfrescoAuthenticationService,
AlfrescoContentService,
AlfrescoTranslationService,
CoreModule
} from 'ng2-alfresco-core';
import { AlfrescoSearchService } from '../services/alfresco-search.service';
@@ -49,12 +49,12 @@ describe('AlfrescoSearchControlComponent', () => {
AlfrescoSearchAutocompleteComponent
],
providers: [
{provide: AlfrescoTranslateService, useClass: TranslationMock},
{provide: AlfrescoTranslationService, useClass: TranslationMock},
AlfrescoThumbnailService,
SettingsService,
AlfrescoSettingsService,
AlfrescoApiService,
AuthService,
ContentService,
AlfrescoAuthenticationService,
AlfrescoContentService,
AlfrescoSearchService
]
}).compileComponents().then(() => {
@@ -65,7 +65,7 @@ describe('AlfrescoSearchControlComponent', () => {
}));
it('should setup i18n folder', () => {
let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService);
let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
spyOn(translationService, 'addTranslationFolder');
fixture.detectChanges();
expect(translationService.addTranslationFolder)

4
ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts
View File

@@ -18,7 +18,7 @@
import { FormControl, Validators } from '@angular/forms';
import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter, ViewChild } from '@angular/core';
import { Observable, Subject } from 'rxjs/Rx';
import { AlfrescoTranslateService } from 'ng2-alfresco-core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component';
import { SearchTermValidator } from './../forms/search-term-validator';
@@ -86,7 +86,7 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy {
private focusSubject = new Subject<FocusEvent>();
constructor(private translateService: AlfrescoTranslateService) {
constructor(private translateService: AlfrescoTranslationService) {
this.searchControl = new FormControl(
this.searchTerm,

14
ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.spec.ts
View File

@@ -25,10 +25,10 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi
import { TranslationMock } from './../assets/translation.service.mock';
import { AlfrescoSearchService } from '../services/alfresco-search.service';
import {
SettingsService,
AlfrescoSettingsService,
AlfrescoApiService,
AuthService,
AlfrescoTranslateService,
AlfrescoAuthenticationService,
AlfrescoTranslationService,
CoreModule,
StorageService,
LogService
@@ -107,7 +107,7 @@ describe('AlfrescoSearchComponent', () => {
declarations: [ AlfrescoSearchComponent ], // declare the test component
providers: [
AlfrescoSearchService,
{provide: AlfrescoTranslateService, useClass: TranslationMock},
{provide: AlfrescoTranslationService, useClass: TranslationMock},
AlfrescoThumbnailService
]
}).compileComponents().then(() => {
@@ -133,8 +133,8 @@ describe('AlfrescoSearchComponent', () => {
it('should have a null search term if no query param provided via RouteParams', () => {
let injector = ReflectiveInjector.resolveAndCreate([
AlfrescoSearchService,
AuthService,
SettingsService,
AlfrescoAuthenticationService,
AlfrescoSettingsService,
AlfrescoApiService,
StorageService,
LogService,
@@ -146,7 +146,7 @@ describe('AlfrescoSearchComponent', () => {
});
it('should setup i18n folder', () => {
let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService);
let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
spyOn(translationService, 'addTranslationFolder');
fixture.detectChanges();
expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');

4
ng2-components/ng2-alfresco-search/src/components/alfresco-search.component.ts
View File

@@ -19,7 +19,7 @@ import { Component, EventEmitter, Input, Output, Optional, OnChanges, SimpleChan
import { ActivatedRoute, Params } from '@angular/router';
import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service';
import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service';
import { AlfrescoTranslateService } from 'ng2-alfresco-core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
import { MinimalNodeEntity } from 'alfresco-js-api';
@Component({
@@ -66,7 +66,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', '');
constructor(private searchService: AlfrescoSearchService,
private translateService: AlfrescoTranslateService,
private translateService: AlfrescoTranslationService,
private thumbnailService: AlfrescoThumbnailService,
@Optional() private route: ActivatedRoute) {
}

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

@@ -17,7 +17,7 @@
import { ReflectiveInjector } from '@angular/core';
import { AlfrescoSearchService } from './alfresco-search.service';
import { AuthService, SettingsService, AlfrescoApiService, StorageService, LogService } from 'ng2-alfresco-core';
import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService, StorageService, LogService } from 'ng2-alfresco-core';
import { fakeApi, fakeSearch, fakeError } from '../assets/alfresco-search.service.mock';
declare let jasmine: any;
@@ -31,9 +31,9 @@ describe('AlfrescoSearchService', () => {
beforeEach(() => {
injector = ReflectiveInjector.resolveAndCreate([
AlfrescoSearchService,
SettingsService,
AlfrescoSettingsService,
AlfrescoApiService,
AuthService,
AlfrescoAuthenticationService,
StorageService,
LogService
]);

4
ng2-components/ng2-alfresco-search/src/services/alfresco-search.service.ts
View File

@@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs/Rx';
import { AuthService, AlfrescoApiService } from 'ng2-alfresco-core';
import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core';
/**
* Internal service used by Document List component.
@@ -25,7 +25,7 @@ import { AuthService, AlfrescoApiService } from 'ng2-alfresco-core';
@Injectable()
export class AlfrescoSearchService {
constructor(public authService: AuthService,
constructor(public authService: AlfrescoAuthenticationService,
private apiService: AlfrescoApiService) {
}

8
ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.spec.ts
View File

@@ -17,7 +17,7 @@
import { ReflectiveInjector } from '@angular/core';
import { AlfrescoThumbnailService } from './alfresco-thumbnail.service';
import { AlfrescoApiService, AuthService, ContentService, SettingsService, StorageService, LogService } from 'ng2-alfresco-core';
import { AlfrescoApiService, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoSettingsService, StorageService, LogService } from 'ng2-alfresco-core';
describe('AlfrescoThumbnailService', () => {
@@ -27,9 +27,9 @@ describe('AlfrescoThumbnailService', () => {
beforeEach(() => {
injector = ReflectiveInjector.resolveAndCreate([
AlfrescoApiService,
AuthService,
ContentService,
SettingsService,
AlfrescoAuthenticationService,
AlfrescoContentService,
AlfrescoSettingsService,
AlfrescoThumbnailService,
StorageService,
LogService

4
ng2-components/ng2-alfresco-search/src/services/alfresco-thumbnail.service.ts
View File

@@ -16,7 +16,7 @@
*/
import { Injectable } from '@angular/core';
import { ContentService } from 'ng2-alfresco-core';
import { AlfrescoContentService } from 'ng2-alfresco-core';
@Injectable()
export class AlfrescoThumbnailService {
@@ -50,7 +50,7 @@ export class AlfrescoThumbnailService {
'application/vnd.apple.numbers': 'ft_ic_spreadsheet'
};
constructor(public contentService: ContentService) {
constructor(public contentService: AlfrescoContentService) {
}
/**