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

fix document list bundling

Browse Source
This commit is contained in:
Denys Vuika
2016-12-09 10:41:17 +00:00
parent b3b6193006
commit cfb4fc71c0
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,9 +157,11 @@ export class DocumentList implements OnInit, AfterContentInit {
private translate: AlfrescoTranslationService) {
let rootPath = './..';
if (module && module.id) {
rootPath = module.id.replace('/components/document-list.js', '');
}
try {
if (module && module.id) {
rootPath = module.id.replace('/components/document-list.js', '');
}
} catch (e) {}
this.data = new ShareDataTableAdapter(this.documentListService, rootPath, []);
@@ -171,18 +173,17 @@ export class DocumentList implements OnInit, AfterContentInit {
}
resolveIconPath(icon: string): string {
let result = null;
try {
// webpack
result = require(`./../img/${icon}`);
return require(`./../img/${icon}`);
} catch (e) {
// system.js
if (module && module.id) {
let baseComponentPath = module.id.replace('/components/document-list.js', '');
result = `${baseComponentPath}/img/${icon}`;
return `${baseComponentPath}/img/${icon}`;
}
}
return result;
return null;
}
getContextActions(node: MinimalNodeEntity) {

7
ng2-components/ng2-alfresco-documentlist/src/data/share-datatable-adapter.ts
View File

@@ -313,17 +313,16 @@ export class ShareDataTableAdapter implements DataTableAdapter, PaginationProvid
}
getImagePath(id: string): any {
let result = null;
try {
// webpack
result = require(`${this.basePath}/img/${id}`);
return require(`./../img/${id}`);
} catch (e) {
// system.js
if (module && module.id) {
result = `${this.basePath}/img/${id}`;
return `${this.basePath}/img/${id}`;
}
}
return result;
return null;
}
private resetPagination() {