Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
6364c67f
Commit
6364c67f
authored
Feb 07, 2018
by
tsushima
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
直近親要素までアンダーライン対応
parent
98fbfd00
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
abvw/common/js/html2canvas.js
+10
-3
No files found.
abvw/common/js/html2canvas.js
View file @
6364c67f
...
@@ -722,6 +722,13 @@ var NodeContainer = function () {
...
@@ -722,6 +722,13 @@ var NodeContainer = function () {
var
position
=
(
0
,
_position
.
parsePosition
)(
style
.
position
);
var
position
=
(
0
,
_position
.
parsePosition
)(
style
.
position
);
var
parentStyle
=
node
.
parentNode
.
style
;
if
(
style
.
textDecoration
===
'none'
&&
parentStyle
&&
parentStyle
.
textDecoration
)
{
style
.
parentTextDecoration
=
parentStyle
.
textDecoration
;
style
.
parentTextDecorationColor
=
parentStyle
.
textDecorationColor
;
style
.
parentTextDecorationStyle
=
parentStyle
.
textDecorationStyle
;
}
this
.
style
=
{
this
.
style
=
{
background
:
IS_INPUT
?
_Input
.
INPUT_BACKGROUND
:
(
0
,
_background
.
parseBackground
)(
style
,
resourceLoader
),
background
:
IS_INPUT
?
_Input
.
INPUT_BACKGROUND
:
(
0
,
_background
.
parseBackground
)(
style
,
resourceLoader
),
border
:
IS_INPUT
?
_Input
.
INPUT_BORDERS
:
(
0
,
_border
.
parseBorder
)(
style
),
border
:
IS_INPUT
?
_Input
.
INPUT_BORDERS
:
(
0
,
_border
.
parseBorder
)(
style
),
...
@@ -1856,13 +1863,13 @@ var parseTextDecorationStyle = function parseTextDecorationStyle(style) {
...
@@ -1856,13 +1863,13 @@ var parseTextDecorationStyle = function parseTextDecorationStyle(style) {
};
};
var
parseTextDecoration
=
exports
.
parseTextDecoration
=
function
parseTextDecoration
(
style
)
{
var
parseTextDecoration
=
exports
.
parseTextDecoration
=
function
parseTextDecoration
(
style
)
{
var
textDecorationLine
=
parseTextDecorationLine
(
style
.
textDecorationLine
?
style
.
textDecorationLine
:
style
.
textDecoration
);
var
textDecorationLine
=
parseTextDecorationLine
(
style
.
parentTextDecoration
?
style
.
parentTextDecoration
:
style
.
textDecorationLine
?
style
.
textDecorationLine
:
style
.
textDecoration
);
if
(
textDecorationLine
===
null
)
{
if
(
textDecorationLine
===
null
)
{
return
TEXT_DECORATION
.
NONE
;
return
TEXT_DECORATION
.
NONE
;
}
}
var
textDecorationColor
=
style
.
textDecorationColor
?
new
_Color2
.
default
(
style
.
textDecorationColor
)
:
null
;
var
textDecorationColor
=
style
.
parentTextDecorationColor
?
style
.
parentTextDecorationColor
:
style
.
textDecorationColor
?
new
_Color2
.
default
(
style
.
textDecorationColor
)
:
null
;
var
textDecorationStyle
=
parseTextDecorationStyle
(
style
.
textDecorationStyle
);
var
textDecorationStyle
=
style
.
parentTextDecorationStyle
?
style
.
parentTextDecorationStyle
:
parseTextDecorationStyle
(
style
.
textDecorationStyle
);
return
{
return
{
textDecorationLine
:
textDecorationLine
,
textDecorationLine
:
textDecorationLine
,
...
...
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