diff --git a/demo/demo.js b/demo/demo.js index 58e7fdfd8d..4545fce7fe 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -5,11 +5,16 @@ var doc = new docx.Document(); var paragraph = new docx.Paragraph("Hello World"); var institutionText = new docx.TextRun("University College London").bold(); var dateText = new docx.TextRun("5th Dec 2015").tab().bold(); -paragraph.addText(institutionText); -paragraph.addText(dateText); +paragraph.addRun(institutionText); +paragraph.addRun(dateText); doc.addParagraph(paragraph); -var exporter = new docx.LocalPacker(doc); + +var media = new docx.Media(); +media.addMedia("happy-penguins", "./demo/penguins.jpg"); +// var pictureRun = new docx.PictureRun(""); + +var exporter = new docx.LocalPacker(doc, undefined, undefined, undefined, media); exporter.pack('My Document'); console.log('Document created succesfully at project root!'); \ No newline at end of file diff --git a/demo/penguins.jpg b/demo/penguins.jpg new file mode 100644 index 0000000000..e4834ee095 Binary files /dev/null and b/demo/penguins.jpg differ diff --git a/ts/export/packer/express.ts b/ts/export/packer/express.ts index 737c220779..16722ff484 100644 --- a/ts/export/packer/express.ts +++ b/ts/export/packer/express.ts @@ -1,5 +1,6 @@ import * as express from "express"; import { Document } from "../../docx/document"; +import { Media } from "../../media"; import { Numbering } from "../../numbering"; import { Properties } from "../../properties"; import { Styles } from "../../styles"; @@ -8,8 +9,8 @@ import { Packer } from "./packer"; export class ExpressPacker extends Packer { private res: express.Response; - constructor(document: Document, res: express.Response, styles?: Styles, properties?: Properties, numbering?: Numbering) { - super(document, styles, properties, numbering); + constructor(document: Document, res: express.Response, styles?: Styles, properties?: Properties, numbering?: Numbering, media?: Media) { + super(document, styles, properties, numbering, media); this.res = res; this.res.on("close", () => { diff --git a/ts/export/packer/local.ts b/ts/export/packer/local.ts index d1a5980662..bbb10e2a5a 100644 --- a/ts/export/packer/local.ts +++ b/ts/export/packer/local.ts @@ -1,5 +1,6 @@ import * as fs from "fs"; import { Document } from "../../docx/document"; +import { Media } from "../../media"; import { Numbering } from "../../numbering"; import { Properties } from "../../properties"; import { Styles } from "../../styles"; @@ -8,8 +9,8 @@ import { Packer } from "./packer"; export class LocalPacker extends Packer { private stream: fs.WriteStream; - constructor(document: Document, styles?: Styles, properties?: Properties, numbering?: Numbering) { - super(document, styles, properties, numbering); + constructor(document: Document, styles?: Styles, properties?: Properties, numbering?: Numbering, media?: Media) { + super(document, styles, properties, numbering, media); } public pack(path: string): void { diff --git a/ts/index.ts b/ts/index.ts index 0227b712a7..7c5a2fda81 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -2,4 +2,5 @@ export * from "./docx"; export * from "./export"; export { Numbering } from "./numbering"; export { Styles } from "./styles"; +export { Media } from "./media"; export * from "./export";