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
3d591981
Commit
3d591981
authored
Aug 27, 2020
by
Kim Eunchul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#11053 【Web】マーキング設定ダイアログの太さ指定に何もチェックがついていない
parent
a7db59c4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
103 additions
and
1 deletions
+103
-1
abvw/js/contentview_Gomu.js
+35
-1
abvw/js/contentview_Maker.js
+34
-0
abvw/js/contentview_Pen.js
+34
-0
No files found.
abvw/js/contentview_Gomu.js
View file @
3d591981
...
@@ -44,7 +44,41 @@ CONTENTVIEW_GOMU.Eraser_SetDefaultValue = function() {
...
@@ -44,7 +44,41 @@ CONTENTVIEW_GOMU.Eraser_SetDefaultValue = function() {
// Choose type of eraser, and draw to canvas
// Choose type of eraser, and draw to canvas
CONTENTVIEW_GOMU
.
dlgGomu_chooseType
=
function
(
typeValue
)
{
CONTENTVIEW_GOMU
.
dlgGomu_chooseType
=
function
(
typeValue
)
{
var
canvas
=
document
.
getElementById
(
'dlgGomu_cvMain'
);
var
canvas
=
document
.
getElementById
(
'dlgGomu_cvMain'
);
var
gomuLL
=
document
.
getElementById
(
'text_dlgGomu_rdo4'
).
getElementsByTagName
(
'img'
)[
0
];
var
gomuL
=
document
.
getElementById
(
'text_dlgGomu_rdo3'
).
getElementsByTagName
(
'img'
)[
0
];
var
gomuM
=
document
.
getElementById
(
'text_dlgGomu_rdo2'
).
getElementsByTagName
(
'img'
)[
0
];
var
gomuS
=
document
.
getElementById
(
'text_dlgGomu_rdo1'
).
getElementsByTagName
(
'img'
)[
0
];
switch
(
typeValue
){
case
5
:
gomuS
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
gomuM
.
removeAttribute
(
"style"
);
gomuL
.
removeAttribute
(
"style"
);
gomuLL
.
removeAttribute
(
"style"
);
break
;
case
12.5
:
gomuS
.
removeAttribute
(
"style"
);
gomuM
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
gomuL
.
removeAttribute
(
"style"
);
gomuLL
.
removeAttribute
(
"style"
);
break
;
case
25
:
gomuS
.
removeAttribute
(
"style"
);
gomuM
.
removeAttribute
(
"style"
);
gomuL
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
gomuLL
.
removeAttribute
(
"style"
);
break
;
case
50
:
gomuS
.
removeAttribute
(
"style"
);
gomuM
.
removeAttribute
(
"style"
);
gomuL
.
removeAttribute
(
"style"
);
gomuLL
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
break
;
}
if
(
canvas
.
getContext
)
{
if
(
canvas
.
getContext
)
{
...
...
abvw/js/contentview_Maker.js
View file @
3d591981
...
@@ -171,6 +171,40 @@ CONTENTVIEW_MAKER.Maker_chooseType = function(typeValue, color) {
...
@@ -171,6 +171,40 @@ CONTENTVIEW_MAKER.Maker_chooseType = function(typeValue, color) {
var
fillColor
;
var
fillColor
;
CONTENTVIEW_MAKER
.
maker_Size
=
typeValue
;
CONTENTVIEW_MAKER
.
maker_Size
=
typeValue
;
var
canvas
=
document
.
getElementById
(
'Maker_cvPreviewmaker'
);
var
canvas
=
document
.
getElementById
(
'Maker_cvPreviewmaker'
);
var
markerLL
=
document
.
getElementById
(
'marker-oversize-text'
).
getElementsByTagName
(
'img'
)[
0
];
var
markerL
=
document
.
getElementById
(
'marker-large-text'
).
getElementsByTagName
(
'img'
)[
0
];
var
markerM
=
document
.
getElementById
(
'marker-medium-text'
).
getElementsByTagName
(
'img'
)[
0
];
var
markerS
=
document
.
getElementById
(
'marker-small-text'
).
getElementsByTagName
(
'img'
)[
0
];
switch
(
typeValue
){
case
5
:
markerS
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
markerM
.
removeAttribute
(
"style"
);
markerL
.
removeAttribute
(
"style"
);
markerLL
.
removeAttribute
(
"style"
);
break
;
case
12.5
:
markerS
.
removeAttribute
(
"style"
);
markerM
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
markerL
.
removeAttribute
(
"style"
);
markerLL
.
removeAttribute
(
"style"
);
break
;
case
25
:
markerS
.
removeAttribute
(
"style"
);
markerM
.
removeAttribute
(
"style"
);
markerL
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
markerLL
.
removeAttribute
(
"style"
);
break
;
case
50
:
markerS
.
removeAttribute
(
"style"
);
markerM
.
removeAttribute
(
"style"
);
markerL
.
removeAttribute
(
"style"
);
markerLL
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
break
;
}
if
(
color
==
null
||
color
==
'undefined'
){
if
(
color
==
null
||
color
==
'undefined'
){
fillColor
=
"f8ff00"
;
fillColor
=
"f8ff00"
;
...
...
abvw/js/contentview_Pen.js
View file @
3d591981
...
@@ -177,6 +177,40 @@ CONTENTVIEW_PEN.Pen_chooseType = function(typeValue, color) {
...
@@ -177,6 +177,40 @@ CONTENTVIEW_PEN.Pen_chooseType = function(typeValue, color) {
var
fillColor
;
var
fillColor
;
CONTENTVIEW_PEN
.
pen_Size
=
typeValue
;
CONTENTVIEW_PEN
.
pen_Size
=
typeValue
;
var
canvas
=
document
.
getElementById
(
'Pen_cvPreviewPen'
);
var
canvas
=
document
.
getElementById
(
'Pen_cvPreviewPen'
);
var
penLL
=
document
.
getElementById
(
'pen-oversize-text'
).
getElementsByTagName
(
'img'
)[
0
];
var
penL
=
document
.
getElementById
(
'pen-large-text'
).
getElementsByTagName
(
'img'
)[
0
];
var
penM
=
document
.
getElementById
(
'pen-medium-text'
).
getElementsByTagName
(
'img'
)[
0
];
var
penS
=
document
.
getElementById
(
'pen-small-text'
).
getElementsByTagName
(
'img'
)[
0
];
switch
(
typeValue
){
case
5
:
penS
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
penM
.
removeAttribute
(
"style"
);
penL
.
removeAttribute
(
"style"
);
penLL
.
removeAttribute
(
"style"
);
break
;
case
12.5
:
penS
.
removeAttribute
(
"style"
);
penM
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
penL
.
removeAttribute
(
"style"
);
penLL
.
removeAttribute
(
"style"
);
break
;
case
25
:
penS
.
removeAttribute
(
"style"
);
penM
.
removeAttribute
(
"style"
);
penL
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
penLL
.
removeAttribute
(
"style"
);
break
;
case
50
:
penS
.
removeAttribute
(
"style"
);
penM
.
removeAttribute
(
"style"
);
penL
.
removeAttribute
(
"style"
);
penLL
.
setAttribute
(
"style"
,
"border: 1px solid #ff0000"
);
break
;
}
if
(
color
==
null
||
color
==
'undefined'
)
{
if
(
color
==
null
||
color
==
'undefined'
)
{
fillColor
=
"#fe0000"
;
fillColor
=
"#fe0000"
;
...
...
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