Skip to content

Commit 630b1f5

Browse files
committed
Merge branch 'master' into pr-1133
2 parents 371cc97 + dd88012 commit 630b1f5

24 files changed

+10425
-9770
lines changed

.eslintrc.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ module.exports = {
2020
project: ["./tsconfig.json"],
2121
},
2222
plugins: ["react", "@typescript-eslint"],
23-
ignorePatterns: [".eslintrc.js"],
23+
ignorePatterns: [".eslintrc.js", "*.mjs", "demos/*"],
2424
rules: {
2525
"@typescript-eslint/indent": ["error", "tab"],
26+
"@typescript-eslint/prefer-nullish-coalescing": 0, // "warn", too many items!
27+
"@typescript-eslint/restrict-plus-operands": "warn", // TODO: "error"
28+
"@typescript-eslint/restrict-template-expressions": "warn", // TODO: "error"
2629
"@typescript-eslint/strict-boolean-expressions": 0,
2730
"comma-dangle": ["error", "only-multiline"],
2831
"no-lone-blocks": 0,

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Notes]
99

10-
## [3.12.0] - 2022-10-??
10+
## [3.12.0] - 2023-02-??
11+
12+
### Added
13+
14+
- Allow selecting round or square line cap on line charts [\#1126](https://github.com/gitbrent/PptxGenJS/pull/1126) ([mathbruyen](https://github.com/mathbruyen))
15+
- Added optional image shadow props [\#1147](https://github.com/gitbrent/PptxGenJS/pull/1147) ([seekuehe](https://github.com/seekuehe))
1116

1217
### Fixed
1318

19+
- PowerPoint shows the "repair" dialog when adding an SVG image to a slide master [\#1150](https://github.com/gitbrent/PptxGenJS/issues/1150) ([BenHall-1](https://github.com/BenHall-1))
1420
- Fixed gh-pages text api docs: transparency + wrap [\#1153](https://github.com/gitbrent/PptxGenJS/pull/1153) ([tjinauyeung](https://github.com/tjinauyeung))
21+
- Fixed handle `holeSize=0` for doughnut chart [\#1180](https://github.com/gitbrent/PptxGenJS/pull/1180) ([mathbruyen](https://github.com/mathbruyen))
1522
- Fixed 3D chart options not working correctly (and updated demo) ([gitbrent](https://github.com/gitbrent))
1623

1724
### Changed

demos/browser/index.html

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,15 @@ <h6 class="text-primary">Slide 1: Image Types</h6>
720720
</ul>
721721
</div>
722722
<div class="col">
723-
<h6 class="text-primary">Slide 2: Rounding and Sizing</h6>
723+
<h6 class="text-primary">Slide 2: Image URLs</h6>
724+
<ul class="mb-0">
725+
<li>Source: GitHub CDN</li>
726+
<li>Source: Wikimedia URL</li>
727+
<li>Source: URL variables</li>
728+
</ul>
729+
</div>
730+
<div class="col">
731+
<h6 class="text-primary">Slide 2: Sizing/Rounding</h6>
724732
<ul class="mb-0">
725733
<li>Rounding: options</li>
726734
<li>Sizing: contain</li>
@@ -729,19 +737,19 @@ <h6 class="text-primary">Slide 2: Rounding and Sizing</h6>
729737
</ul>
730738
</div>
731739
<div class="col">
732-
<h6 class="text-primary">Slide 3: Rotation Angles</h6>
740+
<h6 class="text-primary">Slide 3: Image Rotation</h6>
733741
<ul class="mb-0">
734742
<li>Rotate: 45</li>
735743
<li>Rotate: 180</li>
736744
<li>Rotate: 315</li>
737745
</ul>
738746
</div>
739747
<div class="col">
740-
<h6 class="text-primary">Slide 4: Source URLs</h6>
748+
<h6 class="text-primary">Slide 5: Image Shadows</h6>
741749
<ul class="mb-0">
742-
<li>Source: GitHub CDN</li>
743-
<li>Source: Wikimedia URL</li>
744-
<li>Source: URL variables</li>
750+
<li>Type: Outer</li>
751+
<li>Type: None</li>
752+
<li>Type: Inner</li>
745753
</ul>
746754
</div>
747755
</div>

0 commit comments

Comments
 (0)