Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
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
julien
pagedjs
Commits
3a4a2131
Commit
3a4a2131
authored
Apr 07, 2018
by
Fred Chasen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix layout next repeat bug
parent
93c1e649
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
8 deletions
+13
-8
layout.js
src/chunker/layout.js
+13
-8
No files found.
src/chunker/layout.js
View file @
3a4a2131
...
@@ -71,8 +71,10 @@ class Layout {
...
@@ -71,8 +71,10 @@ class Layout {
if
(
!
shallow
)
{
if
(
!
shallow
)
{
next
=
after
(
node
,
content
);
next
=
after
(
node
,
content
);
if
(
next
)
{
walker
=
walk
(
next
,
content
);
walker
=
walk
(
next
,
content
);
}
}
}
}
else
{
}
else
{
check
=
1000
;
// Force check
check
=
1000
;
// Force check
...
@@ -88,11 +90,15 @@ class Layout {
...
@@ -88,11 +90,15 @@ class Layout {
let
overflow
=
this
.
overflow
(
this
.
element
);
let
overflow
=
this
.
overflow
(
this
.
element
);
if
(
overflow
)
{
if
(
overflow
)
{
newBreakToken
=
this
.
findBreakToken
(
overflow
);
newBreakToken
=
this
.
findBreakToken
(
overflow
);
if
(
newBreakToken
&&
newBreakToken
.
node
)
{
this
.
removeOverflow
(
overflow
);
this
.
removeOverflow
(
overflow
);
}
break
;
break
;
}
else
{
}
else
{
// Underflow
// Underflow
hasOverflow
=
false
;
hasOverflow
=
false
;
...
@@ -193,7 +199,7 @@ class Layout {
...
@@ -193,7 +199,7 @@ class Layout {
let
offset
=
overflow
.
startOffset
;
let
offset
=
overflow
.
startOffset
;
let
node
,
ref
,
parent
,
index
,
temp
;
let
node
,
ref
,
parent
,
index
,
temp
;
if
(
overflow
.
startContainer
.
nodeType
===
1
&&
offset
)
{
if
(
overflow
.
startContainer
.
nodeType
===
1
)
{
// node = children.querySelector("[ref='" + overflow.startContainer.childNodes[offset].getAttribute("ref") + "']");
// node = children.querySelector("[ref='" + overflow.startContainer.childNodes[offset].getAttribute("ref") + "']");
temp
=
overflow
.
startContainer
.
childNodes
[
offset
];
temp
=
overflow
.
startContainer
.
childNodes
[
offset
];
...
@@ -209,11 +215,6 @@ class Layout {
...
@@ -209,11 +215,6 @@ class Layout {
node
=
parent
.
childNodes
[
index
];
node
=
parent
.
childNodes
[
index
];
offset
=
0
;
offset
=
0
;
}
}
}
else
if
(
overflow
.
startContainer
.
nodeType
===
1
)
{
// node = children.querySelector("[ref='" + overflow.startContainer.getAttribute("ref") + "']");
ref
=
overflow
.
startContainer
.
getAttribute
(
"
ref
"
);
node
=
this
.
wrapper
.
querySelector
(
"
[ref='
"
+
ref
+
"
']
"
);
}
else
{
}
else
{
index
=
Array
.
prototype
.
indexOf
.
call
(
overflow
.
startContainer
.
parentNode
.
childNodes
,
overflow
.
startContainer
);
index
=
Array
.
prototype
.
indexOf
.
call
(
overflow
.
startContainer
.
parentNode
.
childNodes
,
overflow
.
startContainer
);
// let parent = children.querySelector("[ref='" + overflow.startContainer.parentNode.getAttribute("ref") + "']");
// let parent = children.querySelector("[ref='" + overflow.startContainer.parentNode.getAttribute("ref") + "']");
...
@@ -222,6 +223,10 @@ class Layout {
...
@@ -222,6 +223,10 @@ class Layout {
node
=
parent
.
childNodes
[
index
];
node
=
parent
.
childNodes
[
index
];
}
}
if
(
!
node
)
{
return
;
}
return
{
return
{
node
,
node
,
offset
offset
...
...
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