Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
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
web-apps
Commits
559d86cc
Commit
559d86cc
authored
May 10, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Баг с подсветкой "без заливки" в сортировке или фильтрах.
parent
25fc600b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+2
-2
No files found.
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file @
559d86cc
...
...
@@ -897,7 +897,7 @@ define([
this
.
miFilterCellColor
.
setChecked
(
false
,
true
);
this
.
miSortCellColor
.
setChecked
(
sort
==
Asc
.
c_oAscSortOptions
.
ByColorFill
,
true
);
if
(
sort
==
Asc
.
c_oAscSortOptions
.
ByColorFill
)
this
.
mnuSortColorCellsPicker
.
select
(
sortColor
,
true
);
this
.
mnuSortColorCellsPicker
.
select
(
(
sortColor
)
?
sortColor
:
'
transparent
'
,
true
);
}
if
(
isCustomFilter
)
{
...
...
@@ -928,7 +928,7 @@ define([
filterColor
=
Common
.
Utils
.
ThemeColor
.
getHexColor
(
filterColor
.
get_r
(),
filterColor
.
get_g
(),
filterColor
.
get_b
()).
toLocaleUpperCase
();
if
(
colorFilter
.
asc_getCellColor
()
===
null
)
{
// cell color
this
.
miFilterCellColor
.
setChecked
(
true
,
true
);
this
.
mnuFilterColorCellsPicker
.
select
(
filterColor
,
true
);
this
.
mnuFilterColorCellsPicker
.
select
(
(
filterColor
)
?
filterColor
:
'
transparent
'
,
true
);
}
else
if
(
colorFilter
.
asc_getCellColor
()
===
false
)
{
// font color
this
.
miFilterFontColor
.
setChecked
(
true
,
true
);
this
.
mnuFilterColorFontPicker
.
select
(
filterColor
,
true
);
...
...
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