From e9e68bc802fa518e37507a05bd9b28bfebb599c9 Mon Sep 17 00:00:00 2001 From: Dolan Date: Wed, 20 Dec 2017 00:06:08 +0000 Subject: [PATCH] Move media to sub folder --- src/docx/drawing/index.ts | 2 +- src/docx/file.ts | 2 +- src/docx/index.ts | 2 ++ src/{ => docx}/media/data.ts | 0 src/docx/media/index.ts | 2 ++ src/{media/index.ts => docx/media/media.ts} | 0 src/docx/paragraph/paragraph.ts | 2 +- src/docx/paragraph/run/picture-run.ts | 2 +- src/index.ts | 4 +--- 9 files changed, 9 insertions(+), 7 deletions(-) rename src/{ => docx}/media/data.ts (100%) create mode 100644 src/docx/media/index.ts rename src/{media/index.ts => docx/media/media.ts} (100%) diff --git a/src/docx/drawing/index.ts b/src/docx/drawing/index.ts index 8278cab933..46b77e7a58 100644 --- a/src/docx/drawing/index.ts +++ b/src/docx/drawing/index.ts @@ -1,5 +1,5 @@ import { XmlComponent } from "../../docx/xml-components"; -import { IData } from "../../media/data"; +import { IData } from "../media"; import { Inline } from "./inline"; export class Drawing extends XmlComponent { diff --git a/src/docx/file.ts b/src/docx/file.ts index 4580121479..ef32c39c73 100644 --- a/src/docx/file.ts +++ b/src/docx/file.ts @@ -1,8 +1,8 @@ -import { Media } from "../media"; import { IPropertiesOptions, Properties } from "../properties"; import { Styles } from "../styles"; import { DefaultStylesFactory } from "../styles/factory"; import { Document } from "./document"; +import { Media } from "./media"; import { Numbering } from "./numbering"; import { Paragraph } from "./paragraph"; import { Table } from "./table"; diff --git a/src/docx/index.ts b/src/docx/index.ts index 2e44ea7113..063242fd49 100644 --- a/src/docx/index.ts +++ b/src/docx/index.ts @@ -3,3 +3,5 @@ export * from "./paragraph"; export * from "./table"; export * from "./file"; export * from "./numbering"; +export * from "./media"; +export * from "./drawing"; diff --git a/src/media/data.ts b/src/docx/media/data.ts similarity index 100% rename from src/media/data.ts rename to src/docx/media/data.ts diff --git a/src/docx/media/index.ts b/src/docx/media/index.ts new file mode 100644 index 0000000000..3575274e26 --- /dev/null +++ b/src/docx/media/index.ts @@ -0,0 +1,2 @@ +export * from "./media"; +export * from "./data"; diff --git a/src/media/index.ts b/src/docx/media/media.ts similarity index 100% rename from src/media/index.ts rename to src/docx/media/media.ts diff --git a/src/docx/paragraph/paragraph.ts b/src/docx/paragraph/paragraph.ts index 8c2ba415a1..c455cc7d49 100644 --- a/src/docx/paragraph/paragraph.ts +++ b/src/docx/paragraph/paragraph.ts @@ -1,5 +1,5 @@ // http://officeopenxml.com/WPparagraph.php -import { IData } from "../../media/data"; +import { IData } from "../media/data"; import { Num } from "../numbering/num"; import { XmlComponent } from "../xml-components"; import { PictureRun, Run, TextRun } from "./run"; diff --git a/src/docx/paragraph/run/picture-run.ts b/src/docx/paragraph/run/picture-run.ts index 57ab1e56a7..f5d7f4e763 100644 --- a/src/docx/paragraph/run/picture-run.ts +++ b/src/docx/paragraph/run/picture-run.ts @@ -1,5 +1,5 @@ -import { IData } from "../../../media/data"; import { Drawing } from "../../drawing"; +import { IData } from "../../media/data"; import { Run } from "../run"; export class PictureRun extends Run { diff --git a/src/index.ts b/src/index.ts index 34c4233792..0969794c83 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,3 @@ export * from "./docx"; export * from "./export"; -export { Styles } from "./styles"; -export { Media } from "./media"; -export * from "./export"; +export * from "./styles";