smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/multiple-sections' of https://github.com/h4buli/docx into feat/multiple-headers

Browse Source 
# Conflicts:
#	src/export/packer/compiler.ts
#	src/file/content-types/content-types.ts
#	src/file/document/body/section-properties/header-reference/header-reference.ts
#	src/file/document/body/section-properties/section-properties.ts
#	src/file/file.ts
#	src/file/media/media.ts
This commit is contained in:
Dolan Miu
2018-06-22 22:59:38 +01:00
parent 8b3cf8c38c 0b963ec3b8
commit f1ac646518
33 changed files with 621 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/file/media/media.ts
View File

@ -21,13 +21,13 @@ export class Media {
return data;
}
public addMedia(filePath: string, relationshipsCount: number): IMediaData {
public addMedia(filePath: string, referenceId: number): IMediaData {
const key = path.basename(filePath);
const dimensions = sizeOf(filePath);
return this.createMedia(key, relationshipsCount, dimensions, fs.createReadStream(filePath), filePath);
return this.createMedia(key, referenceId, dimensions, fs.createReadStream(filePath), filePath);
}
public addMediaWithData(fileName: string, data: Buffer, relationshipsCount: number, width?: number, height?: number): IMediaData {
public addMediaWithData(fileName: string, data: Buffer, referenceId: number, width?: number, height?: number): IMediaData {
const key = fileName;
let dimensions;
if (width && height) {
@ -39,7 +39,7 @@ export class Media {
dimensions = sizeOf(data);
}
return this.createMedia(key, relationshipsCount, dimensions, data);
return this.createMedia(key, referenceId, dimensions, data);
}
private createMedia(