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

Merge branch 'development' into dev-denys-70

Browse Source
This commit is contained in:
Denys Vuika
2016-07-13 17:22:27 +01:00
parent 139f6a965e 46ac075928
commit 00c28ecd52
11 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ng2-components/ng2-alfresco-documentlist/i18n/en.json Normal file
View File

@@ -0,0 +1,16 @@
{
"ICONS": {
"ft_ic_folder": "Folder",
"ft_ic_raster_image": "Image file",
"ft_ic_pdf": "PDF document",
"ft_ic_ms_excel": "Microsoft Excel file",
"ft_ic_ms_word": "Microsoft Word document",
"ft_ic_ms_powerpoint": "Microsoft PowerPoint file",
"ft_ic_video": "Video file",
"ft_ic_document": "Document file",
"ft_ic_website": "Web resource",
"ft_ic_archive": "Archive file",
"ft_ic_presentation": "Presentation file",
"ft_ic_spreadsheet": "Spreadsheet file"
}
}

2
ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/breadcrumb.component.spec.ts
View File

@@ -96,7 +96,7 @@ describe('DocumentListBreadcrumb', () => {
});
it('should update document list on click', () => {
let documentList = new DocumentList(null, null);
let documentList = new DocumentList(null, null, null);
spyOn(documentList, 'displayFolderContent').and.stub();
let node = <PathNode> { name: 'name', path: '/path' };

2
ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.spec.ts
View File

@@ -34,7 +34,7 @@ describe('ContentColumnList', () => {
beforeEach(() => {
let documentListService = new DocumentListServiceMock();
documentList = new DocumentList(documentListService, null);
documentList = new DocumentList(documentListService, null, null);
actionList = new ContentActionList(documentList);
});

2
ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts
View File

@@ -44,7 +44,7 @@ describe('ContentAction', () => {
documentActions = new DocumentActionsService(null, null);
folderActions = new FolderActionsService(null);
documentList = new DocumentList(documentServiceMock, null);
documentList = new DocumentList(documentServiceMock, null, null);
actionList = new ContentActionList(documentList);
});

2
ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts
View File

@@ -35,7 +35,7 @@ describe('ContentColumnList', () => {
beforeEach(() => {
let service = new DocumentListServiceMock();
documentList = new DocumentList(service, null);
documentList = new DocumentList(service, null, null);
columnList = new ContentColumnList(documentList);
});

2
ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts
View File

@@ -34,7 +34,7 @@ describe('ContentColumn', () => {
beforeEach(() => {
let service = new DocumentListServiceMock();
documentList = new DocumentList(service, null);
documentList = new DocumentList(service, null, null);
columnList = new ContentColumnList(documentList);
});

2
ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts
View File

@@ -34,7 +34,7 @@ describe('DocumentList', () => {
beforeEach(() => {
documentListService = new DocumentListServiceMock();
let zone = new NgZone(false);
documentList = new DocumentList(documentListService, zone);
documentList = new DocumentList(documentListService, zone, null);
eventMock = {
preventDefault: function () {

12
ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts
View File

@@ -31,7 +31,10 @@ import {
HostListener
} from '@angular/core';
import { Subject } from 'rxjs/Rx';
import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core';
import {
CONTEXT_MENU_DIRECTIVES,
AlfrescoTranslationService
} from 'ng2-alfresco-core';
import {
ALFRESCO_DATATABLE_DIRECTIVES,
@@ -127,9 +130,14 @@ export class DocumentList implements OnInit, AfterViewInit, AfterViewChecked, Af
constructor(
private documentListService: DocumentListService,
private ngZone: NgZone) {
private ngZone: NgZone,
private translate: AlfrescoTranslationService) {
this.data = new ShareDataTableAdapter(this.documentListService, this.baseComponentPath, []);
if (translate) {
translate.addTranslationFolder('node_modules/ng2-alfresco-documentlist');
}
}
getContextActions(node: MinimalNodeEntity) {