Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
pagedjs
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cy Z
pagedjs
Commits
c04aa164
Commit
c04aa164
authored
Jun 19, 2020
by
Fred Chasen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for reset on page counter
parent
0284465c
Changes
10
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
247 additions
and
10 deletions
+247
-10
package-lock.json
package-lock.json
+2
-2
counter-page-reset-spec-js-counter-page-should-create-a-pdf-1-snap.png
...reset-spec-js-counter-page-should-create-a-pdf-1-snap.png
+0
-0
counter-page-reset-spec-js-counter-page-should-create-a-pdf-2-snap.png
...reset-spec-js-counter-page-should-create-a-pdf-2-snap.png
+0
-0
counter-page-reset-spec-js-counter-page-should-create-a-pdf-1-snap.png
...reset-spec-js-counter-page-should-create-a-pdf-1-snap.png
+0
-0
counter-page-reset-spec-js-counter-page-should-create-a-pdf-2-snap.png
...reset-spec-js-counter-page-should-create-a-pdf-2-snap.png
+0
-0
counter-page-reset.html
specs/counters/counter-page-reset/counter-page-reset.html
+210
-0
counter-page-reset.spec.js
specs/counters/counter-page-reset/counter-page-reset.spec.js
+25
-0
counter-pages.html
specs/counters/counter-pages/counter-pages.html
+1
-1
counters.js
src/modules/paged-media/counters.js
+9
-5
base.js
src/polisher/base.js
+0
-2
No files found.
package-lock.json
View file @
c04aa164
...
...
@@ -9899,7 +9899,7 @@
"dependencies"
:
{
"jsesc"
:
{
"version"
:
"0.5.0"
,
"resolved"
:
"http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
,
"resolved"
:
"http
s
://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
,
"integrity"
:
"sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
,
"dev"
:
true
}
...
...
@@ -11006,7 +11006,7 @@
},
"through"
:
{
"version"
:
"2.3.8"
,
"resolved"
:
"http://registry.npmjs.org/through/-/through-2.3.8.tgz"
,
"resolved"
:
"http
s
://registry.npmjs.org/through/-/through-2.3.8.tgz"
,
"integrity"
:
"sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
,
"dev"
:
true
},
...
...
specs/counters/counter-page-reset/__image_snapshots_linux__/counter-page-reset-spec-js-counter-page-should-create-a-pdf-1-snap.png
0 → 100644
View file @
c04aa164
144 KB
specs/counters/counter-page-reset/__image_snapshots_linux__/counter-page-reset-spec-js-counter-page-should-create-a-pdf-2-snap.png
0 → 100644
View file @
c04aa164
147 KB
specs/counters/counter-page-reset/__image_snapshots_mac__/counter-page-reset-spec-js-counter-page-should-create-a-pdf-1-snap.png
0 → 100644
View file @
c04aa164
144 KB
specs/counters/counter-page-reset/__image_snapshots_mac__/counter-page-reset-spec-js-counter-page-should-create-a-pdf-2-snap.png
0 → 100644
View file @
c04aa164
147 KB
specs/counters/counter-page-reset/counter-page-reset.html
0 → 100644
View file @
c04aa164
This diff is collapsed.
Click to expand it.
specs/counters/counter-page-reset/counter-page-reset.spec.js
0 → 100644
View file @
c04aa164
const
TIMEOUT
=
10000
;
// Some book might take longer than this to renderer
describe
(
"
counter-page
"
,
()
=>
{
let
page
;
beforeAll
(
async
()
=>
{
page
=
await
loadPage
(
"
counters/counter-page-reset/counter-page-reset.html
"
);
return
page
.
rendered
;
},
TIMEOUT
);
afterAll
(
async
()
=>
{
if
(
!
DEBUG
)
{
await
page
.
close
();
}
});
if
(
!
DEBUG
)
{
it
(
"
should create a pdf
"
,
async
()
=>
{
let
pdf
=
await
page
.
pdf
(
PDF_SETTINGS
);
expect
(
pdf
).
toMatchPDFSnapshot
(
1
);
expect
(
pdf
).
toMatchPDFSnapshot
(
3
);
});
}
}
);
specs/counters/counter-pages/counter-pages.html
View file @
c04aa164
...
...
@@ -39,7 +39,7 @@
}
.start
{
counter-reset
:
page
;
counter-reset
:
page
1
;
}
...
...
src/modules/paged-media/counters.js
View file @
c04aa164
...
...
@@ -100,17 +100,21 @@ class Counters extends Handler {
counter
=
this
.
counters
[
c
];
this
.
processCounterIncrements
(
parsed
,
counter
);
this
.
processCounterResets
(
parsed
,
counter
);
this
.
addCounterValues
(
parsed
,
counter
);
if
(
c
!==
"
page
"
)
{
this
.
addCounterValues
(
parsed
,
counter
);
}
}
}
scopeCounters
(
counters
)
{
let
countersArray
=
[];
for
(
let
c
in
counters
)
{
countersArray
.
push
(
`
${
counters
[
c
].
name
}
0`
);
if
(
c
!==
"
page
"
)
{
countersArray
.
push
(
`
${
counters
[
c
].
name
}
0`
);
}
}
// Add to pages to allow cross page scope
this
.
insertRule
(
`.pagedjs_pages { counter-reset:
${
countersArray
.
join
(
"
"
)}
pages var(--pagedjs-page-count)}`
);
this
.
insertRule
(
`.pagedjs_pages { counter-reset:
${
countersArray
.
join
(
"
"
)}
page
0 page
s var(--pagedjs-page-count)}`
);
}
insertRule
(
rule
)
{
...
...
@@ -215,8 +219,8 @@ class Counters extends Handler {
afterPageLayout
(
pageElement
,
page
)
{
let
pgreset
=
pageElement
.
querySelectorAll
(
"
[data-counter-page-reset]
"
);
pgreset
.
forEach
((
reset
)
=>
{
let
value
=
reset
.
dataset
C
ounterPageReset
;
this
.
styleSheet
.
insertRule
(
`[data-page-number="
${
pageElement
.
dataset
.
pageNumber
}
"] { counter-
reset: page
${
value
}
}`
,
this
.
styleSheet
.
cssRules
.
length
);
let
value
=
reset
.
dataset
.
c
ounterPageReset
;
this
.
styleSheet
.
insertRule
(
`[data-page-number="
${
pageElement
.
dataset
.
pageNumber
}
"] { counter-
increment: none; counter-reset: page
${
value
}
;
}`
,
this
.
styleSheet
.
cssRules
.
length
);
});
}
...
...
src/polisher/base.js
View file @
c04aa164
...
...
@@ -384,13 +384,11 @@ export default `
}
.pagedjs_page.pagedjs_right_page {
counter-increment: page var(--pagedjs-page-counter-increment);
width: var(--pagedjs-width-right);
height: var(--pagedjs-height-right);
}
.pagedjs_page.pagedjs_left_page {
counter-increment: page var(--pagedjs-page-counter-increment);
width: var(--pagedjs-width-left);
height: var(--pagedjs-height-left);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment