Merge branch 'master' of https://github.com/dolanmiu/docx into feat/floating-images

# Conflicts:
#	src/file/drawing/drawing.ts
This commit is contained in:
Dolan
2019-01-09 02:04:06 +00:00
78 changed files with 2656 additions and 1168 deletions

View File

@ -28,10 +28,10 @@ export class Drawing extends XmlComponent {
}
if (!drawingOptions.floating) {
this.inline = new Inline(imageData.referenceId, imageData.dimensions);
this.inline = new Inline(imageData, imageData.dimensions);
this.root.push(this.inline);
} else {
this.root.push(new Anchor(imageData.referenceId, imageData.dimensions, drawingOptions));
this.root.push(new Anchor(imageData, imageData.dimensions, drawingOptions));
}
}