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
a504403a
Commit
a504403a
authored
May 06, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Отладка выделения цвета сортировки.
parent
b06edd9a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
25 deletions
+5
-25
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+5
-25
No files found.
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file @
a504403a
...
...
@@ -515,45 +515,25 @@ define([
this
.
mnuSortColorCellsPicker
=
new
Common
.
UI
.
ColorPaletteExt
({
el
:
$
(
'
#filter-dlg-sort-cells-color
'
),
colors
:
[
'
transparent
'
,
'
FFFF00
'
,
'
00FF00
'
,
'
00FFFF
'
,
'
FF00FF
'
,
'
0000FF
'
,
'
FF0000
'
,
'
00008B
'
,
'
008B8B
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
,
'
A9A9A9
'
,
'
000000
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
]
colors
:
[]
});
this
.
mnuSortColorCellsPicker
.
on
(
'
select
'
,
_
.
bind
(
this
.
onSortColorSelect
,
this
,
Asc
.
c_oAscSortOptions
.
ByColorFill
));
this
.
mnuSortColorFontPicker
=
new
Common
.
UI
.
ColorPaletteExt
({
el
:
$
(
'
#filter-dlg-sort-font-color
'
),
colors
:
[
'
transparent
'
,
'
FFFF00
'
,
'
00FF00
'
,
'
00FFFF
'
,
'
FF00FF
'
,
'
0000FF
'
,
'
FF0000
'
,
'
00008B
'
,
'
008B8B
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
,
'
A9A9A9
'
,
'
000000
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
]
colors
:
[]
});
this
.
mnuSortColorFontPicker
.
on
(
'
select
'
,
_
.
bind
(
this
.
onSortColorSelect
,
this
,
Asc
.
c_oAscSortOptions
.
ByColorFont
));
this
.
mnuFilterColorCellsPicker
=
new
Common
.
UI
.
ColorPaletteExt
({
el
:
$
(
'
#filter-dlg-filter-cells-color
'
),
colors
:
[
'
transparent
'
,
'
FFFF00
'
,
'
00FF00
'
,
'
00FFFF
'
,
'
FF00FF
'
,
'
0000FF
'
,
'
FF0000
'
,
'
00008B
'
,
'
008B8B
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
,
'
A9A9A9
'
,
'
000000
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
]
colors
:
[]
});
this
.
mnuFilterColorCellsPicker
.
on
(
'
select
'
,
_
.
bind
(
this
.
onFilterColorSelect
,
this
,
null
));
this
.
mnuFilterColorFontPicker
=
new
Common
.
UI
.
ColorPaletteExt
({
el
:
$
(
'
#filter-dlg-filter-font-color
'
),
colors
:
[
'
transparent
'
,
'
FFFF00
'
,
'
00FF00
'
,
'
00FFFF
'
,
'
FF00FF
'
,
'
0000FF
'
,
'
FF0000
'
,
'
00008B
'
,
'
008B8B
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
,
'
A9A9A9
'
,
'
000000
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
,
'
006400
'
,
'
800080
'
,
'
8B0000
'
,
'
808000
'
,
'
FFFFFF
'
,
'
D3D3D3
'
]
colors
:
[]
});
this
.
mnuFilterColorFontPicker
.
on
(
'
select
'
,
_
.
bind
(
this
.
onFilterColorSelect
,
this
,
false
));
...
...
@@ -917,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
.
mnuSortColor
Font
Picker
.
select
(
sortColor
,
true
);
this
.
mnuSortColor
Cells
Picker
.
select
(
sortColor
,
true
);
}
if
(
isCustomFilter
)
{
...
...
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