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

Re-name variables (#2486)

Browse Source
This commit is contained in:
Dolan
2023-12-29 23:52:43 +00:00
committed by GitHub
parent ce0e9936c3
commit fa401297da
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/file/paragraph/run/page-number.spec.ts
View File

@ -2,11 +2,11 @@ import { describe, expect, it } from "vitest";
import { Formatter } from "@export/formatter"; import { Formatter } from "@export/formatter";
import { NumberOfPages, NumberOfPagesSection, Page } from "./page-number"; import { CurrentSection, NumberOfPages, NumberOfPagesSection, Page } from "./page-number";
describe("Page", () => { describe("Page", () => {
describe("#constructor()", () => { describe("#constructor()", () => {
it("uses the font name for both ascii and hAnsi", () => { it("should work", () => {
const tree = new Formatter().format(new Page()); const tree = new Formatter().format(new Page());
expect(tree).to.deep.equal({ "w:instrText": [{ _attr: { "xml:space": "preserve" } }, "PAGE"] }); expect(tree).to.deep.equal({ "w:instrText": [{ _attr: { "xml:space": "preserve" } }, "PAGE"] });
}); });
@ -15,7 +15,7 @@ describe("Page", () => {
describe("NumberOfPages", () => { describe("NumberOfPages", () => {
describe("#constructor()", () => { describe("#constructor()", () => {
it("uses the font name for both ascii and hAnsi", () => { it("should work", () => {
const tree = new Formatter().format(new NumberOfPages()); const tree = new Formatter().format(new NumberOfPages());
expect(tree).to.deep.equal({ "w:instrText": [{ _attr: { "xml:space": "preserve" } }, "NUMPAGES"] }); expect(tree).to.deep.equal({ "w:instrText": [{ _attr: { "xml:space": "preserve" } }, "NUMPAGES"] });
}); });
@ -24,9 +24,18 @@ describe("NumberOfPages", () => {
describe("NumberOfPagesSection", () => { describe("NumberOfPagesSection", () => {
describe("#constructor()", () => { describe("#constructor()", () => {
it("uses the font name for both ascii and hAnsi", () => { it("should work", () => {
const tree = new Formatter().format(new NumberOfPagesSection()); const tree = new Formatter().format(new NumberOfPagesSection());
expect(tree).to.deep.equal({ "w:instrText": [{ _attr: { "xml:space": "preserve" } }, "SECTIONPAGES"] }); expect(tree).to.deep.equal({ "w:instrText": [{ _attr: { "xml:space": "preserve" } }, "SECTIONPAGES"] });
}); });
}); });
}); });
describe("CurrentSection", () => {
describe("#constructor()", () => {
it("should work", () => {
const tree = new Formatter().format(new CurrentSection());
expect(tree).to.deep.equal({ "w:instrText": [{ _attr: { "xml:space": "preserve" } }, "SECTION"] });
});
});
});

2
src/file/paragraph/run/page-number.ts
View File

@ -27,7 +27,7 @@ export class NumberOfPagesSection extends XmlComponent {
} }
} }
export class CurrentPageInSection extends XmlComponent { export class CurrentSection extends XmlComponent {
public constructor() { public constructor() {
super("w:instrText"); super("w:instrText");
this.root.push(new TextAttributes({ space: SpaceType.PRESERVE })); this.root.push(new TextAttributes({ space: SpaceType.PRESERVE }));

4
src/file/paragraph/run/run.ts
View File

@ -6,7 +6,7 @@ import { FieldInstruction } from "@file/table-of-contents/field-instruction";
import { Break } from "./break"; import { Break } from "./break";
import { Begin, End, Separate } from "./field"; import { Begin, End, Separate } from "./field";
import { NumberOfPages, NumberOfPagesSection, Page, CurrentPageInSection } from "./page-number"; import { NumberOfPages, NumberOfPagesSection, Page, CurrentSection } from "./page-number";
import { IRunPropertiesOptions, RunProperties } from "./properties"; import { IRunPropertiesOptions, RunProperties } from "./properties";
import { Text } from "./run-components/text"; import { Text } from "./run-components/text";
import { import {
@ -146,7 +146,7 @@ export class Run extends XmlComponent {
break; break;
case PageNumber.CURRENT_SECTION: case PageNumber.CURRENT_SECTION:
this.root.push(new Begin()); this.root.push(new Begin());
this.root.push(new CurrentPageInSection()); this.root.push(new CurrentSection());
this.root.push(new Separate()); this.root.push(new Separate());
this.root.push(new End()); this.root.push(new End());
break; break;