Skip to content

Commit

Permalink
Merge pull request #75 from acestronautical/multi-flyleaf
Browse files Browse the repository at this point in the history
Allow more than one flyleaf with freeform input
  • Loading branch information
sithel authored Feb 3, 2024
2 parents bdb04db + c3ca1ea commit 02ce2f1
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 14 deletions.
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,9 @@ <h2>Page Layout</h2>
</div>

<div class="section" id="flyleaf_info">
<h2>Flyleaf</h2>
<span class="row"> <label>Add flyleaf <input type="checkbox" name="flyleaf"></label>
<span data-balloon-length="medium" aria-label="An extra blank page at the start and end of the book" data-balloon-pos="up">ℹ️</span>
<h2>Flyleafs</h2>
<span class="row"> <label>Add flyleafs <input type="number" name="flyleafs" value="1"></label>
<span data-balloon-length="medium" aria-label="Extra blank pages at the start and end of the book" data-balloon-pos="up">ℹ️</span>
</span>

</div>
Expand Down Expand Up @@ -380,4 +380,4 @@ <h2>Signature Info</h2>
</div>
</body>

</html>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bookbinder",
"version": "1.3.2",
"version": "1.3.3",
"description": "An app to rearrange PDF pages for printing for bookbinding",
"type": "module",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/book.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class Book {
this.print_file = configuration.printFile;
this.page_scaling = configuration.pageScaling;
this.page_positioning = configuration.pagePositioning;
this.flyleaf = configuration.flyleaf;
this.flyleafs = configuration.flyleafs;
this.cropmarks = configuration.cropMarks;
this.cutmarks = configuration.cutMarks;
this.format = configuration.sigFormat;
Expand Down Expand Up @@ -119,7 +119,7 @@ export class Book {
this.pagecount = this.currentdoc.getPageCount();
this.orderedpages = Array.from({ length: this.pagecount }, (x, i) => i);

if (this.flyleaf) {
for (let i = 0; i < this.flyleafs; i++) {
this.orderedpages.unshift('b');
this.orderedpages.unshift('b');

Expand Down
2 changes: 1 addition & 1 deletion src/book.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe("Book model", () => {
duplex: true,
duplexrotate: false,
papersize: [595, 842],
flyleaf: false,
flyleafs: 1,
spineoffset: false,
format: "standardsig",
sigsize: 4,
Expand Down
2 changes: 1 addition & 1 deletion src/models/configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export const schema = z.object({
customSigLength: urlSafe(commaSeparatedNumberList).default([]), // Specific to custom.
foreEdgePaddingPt: urlSafe(z.coerce.number()).default(0), // specific to wacky small
wackySpacing, // specific to wacky small
flyleaf: urlSafe(coercedBoolean).default(false),
flyleafs: urlSafe(z.coerce.number()).default(1),
paperSizeCustomWidth: urlSafe(z.coerce.number()),
paperSizeCustomHeight: urlSafe(z.coerce.number()),
});
Expand Down
2 changes: 1 addition & 1 deletion src/utils/formUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const fromFormToConfiguration = (form) =>
wackySpacing: form.get("wacky_spacing"),
fileDownload: form.get("file_download"),
printFile: form.get("print_file"),
flyleaf: form.has("flyleaf"),
flyleafs: form.get("flyleafs"),
paperSizeCustomWidth: form.get("paper_size_custom_width"),
paperSizeCustomHeight: form.get("paper_size_custom_height"),
});
Expand Down
5 changes: 1 addition & 4 deletions src/utils/renderUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,6 @@ export function renderFormFromSettings(configuration) {
document.querySelector("input[name='rotate_page']").checked = true;
}

if (configuration.flyleaf) {
document.querySelector("input[name='flyleaf']").checked = true;
}

if (configuration.cropMarks) {
document.querySelector("input[name='cropmarks']").checked = true;
}
Expand All @@ -187,6 +183,7 @@ export function renderFormFromSettings(configuration) {
document.querySelector('input[name="top_edge_padding_pt"]').value = configuration.topEdgePaddingPt;
document.querySelector('input[name="bottom_edge_padding_pt"]').value = configuration.bottomEdgePaddingPt;
document.querySelector('input[name="fore_edge_padding_pt"]').value = configuration.foreEdgePaddingPt;
document.querySelector('input[name="flyleafs"]').value = configuration.flyleafs;

// Set select options
document.querySelector('select[name="page_scaling"]').value = configuration.pageScaling;
Expand Down

0 comments on commit 02ce2f1

Please sign in to comment.