Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
aece5789
Commit
aece5789
authored
Jul 14, 2017
by
Alexander.Trofimov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
delete default state color
parent
35666e48
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
cell/view/WorkbookView.js
cell/view/WorkbookView.js
+1
-1
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+2
-4
No files found.
cell/view/WorkbookView.js
View file @
aece5789
...
...
@@ -98,7 +98,7 @@
};
this
.
cells
=
{
defaultState
:
{
background
:
new
CColor
(
255
,
255
,
255
),
border
:
new
CColor
(
212
,
212
,
212
)
,
color
:
new
CColor
(
0
,
0
,
0
)
background
:
new
CColor
(
255
,
255
,
255
),
border
:
new
CColor
(
212
,
212
,
212
)
},
padding
:
-
1
,
/*px horizontal padding*/
paddingPlusBorder
:
-
1
};
...
...
cell/view/WorksheetView.js
View file @
aece5789
...
...
@@ -4598,7 +4598,6 @@
this
.
_fetchCellCache
(
col
,
row
).
text
=
{
state
:
this
.
stringRender
.
getInternalState
(),
flags
:
fl
,
color
:
(
c
.
getFont
().
getColor
()
||
this
.
settings
.
cells
.
defaultState
.
color
),
metrics
:
tm
,
cellW
:
cto
.
maxWidth
,
cellHA
:
ha
,
...
...
@@ -6936,7 +6935,6 @@
var
c
=
this
.
_getVisibleCell
(
c1
,
r1
);
var
font
=
c
.
getFont
();
var
fa
=
font
.
getVerticalAlign
();
var
fc
=
font
.
getColor
();
var
bg
=
c
.
getFill
();
var
cellType
=
c
.
getType
();
var
isNumberFormat
=
(
!
cellType
||
CellValueType
.
Number
===
cellType
);
...
...
@@ -7012,7 +7010,7 @@
cell_info
.
font
.
strikeout
=
font
.
getStrikeout
();
cell_info
.
font
.
subscript
=
fa
===
AscCommon
.
vertalign_SubScript
;
cell_info
.
font
.
superscript
=
fa
===
AscCommon
.
vertalign_SuperScript
;
cell_info
.
font
.
color
=
(
fc
?
asc_obj2Color
(
fc
)
:
new
Asc
.
asc_CColor
(
c_opt
.
defaultState
.
color
));
cell_info
.
font
.
color
=
asc_obj2Color
(
font
.
getColor
(
));
cell_info
.
fill
=
new
asc_CFill
((
null
!=
bg
)
?
asc_obj2Color
(
bg
)
:
bg
);
...
...
@@ -11515,7 +11513,7 @@
flags
:
fl
,
font
:
new
asc
.
FontProperties
(
font
.
getName
(),
font
.
getSize
()),
background
:
bg
||
this
.
settings
.
cells
.
defaultState
.
background
,
textColor
:
font
.
getColor
()
||
this
.
settings
.
cells
.
defaultState
.
color
,
textColor
:
font
.
getColor
(),
cursorPos
:
cursorPos
,
zoom
:
this
.
getZoom
(),
focus
:
isFocus
,
...
...
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