Merge branch 'master' of https://github.com/h4buli/docx into feat/h4-update

# Conflicts:
#	package.json
#	src/file/document/body/body.ts
#	src/file/document/body/section-properties/section-properties.ts
#	src/file/file.ts
#	src/file/media/media.ts
#	src/file/styles/external-styles-factory.ts
#	src/file/table/table-cell.ts
This commit is contained in:
Dolan
2018-08-09 23:21:24 +01:00
19 changed files with 366 additions and 37 deletions

View File

@ -61,6 +61,8 @@ export class Media {
this.map = new Map<string, IMediaData>();
}
x: Math.round(dimensions.width * 9525),
y: Math.round(dimensions.height * 9525),
public getMedia(key: string): IMediaData {
const data = this.map.get(key);