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
1f96ebed
Commit
1f96ebed
authored
Apr 29, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[SSE] Отображение цветов в меню фильтров и сортировки.
parent
44f71cdc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
1 deletion
+35
-1
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+35
-1
No files found.
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file @
1f96ebed
...
@@ -824,7 +824,13 @@ define([
...
@@ -824,7 +824,13 @@ define([
_setDefaults
:
function
()
{
_setDefaults
:
function
()
{
this
.
initialFilterType
=
this
.
configTo
.
asc_getFilterObj
().
asc_getType
();
this
.
initialFilterType
=
this
.
configTo
.
asc_getFilterObj
().
asc_getType
();
var
isCustomFilter
=
(
this
.
initialFilterType
===
Asc
.
c_oAscAutoFilterTypes
.
CustomFilters
);
var
isCustomFilter
=
(
this
.
initialFilterType
===
Asc
.
c_oAscAutoFilterTypes
.
CustomFilters
),
isTextFilter
=
this
.
configTo
.
asc_getIsTextFilter
(),
colorsFill
=
this
.
configTo
.
asc_getColorsFill
(),
colorsFont
=
this
.
configTo
.
asc_getColorsFont
();
this
.
miTextFilter
.
setVisible
(
isTextFilter
);
this
.
miNumFilter
.
setVisible
(
!
isTextFilter
);
this
.
miSortLow2High
.
setChecked
(
false
,
true
);
this
.
miSortLow2High
.
setChecked
(
false
,
true
);
this
.
miSortHigh2Low
.
setChecked
(
false
,
true
);
this
.
miSortHigh2Low
.
setChecked
(
false
,
true
);
...
@@ -837,6 +843,34 @@ define([
...
@@ -837,6 +843,34 @@ define([
}
}
}
}
if
(
colorsFont
&&
colorsFont
.
length
>
0
)
{
var
colors
=
[];
colorsFont
.
forEach
(
function
(
item
,
index
)
{
colors
.
push
(
Common
.
Utils
.
ThemeColor
.
getHexColor
(
item
.
get_r
(),
item
.
get_g
(),
item
.
get_b
()).
toLocaleUpperCase
());
});
this
.
mnuSortColorFontPicker
.
updateColors
(
colors
);
this
.
mnuFilterColorFontPicker
.
updateColors
(
colors
);
this
.
miSortFontColor
.
setVisible
(
true
);
this
.
miFilterFontColor
.
setVisible
(
true
);
}
else
{
this
.
miSortFontColor
.
setVisible
(
false
);
this
.
miFilterFontColor
.
setVisible
(
false
);
}
if
(
colorsFill
&&
colorsFill
.
length
>
0
)
{
var
colors
=
[];
colorsFill
.
forEach
(
function
(
item
,
index
)
{
colors
.
push
(
Common
.
Utils
.
ThemeColor
.
getHexColor
(
item
.
get_r
(),
item
.
get_g
(),
item
.
get_b
()).
toLocaleUpperCase
());
});
this
.
mnuSortColorCellsPicker
.
updateColors
(
colors
);
this
.
mnuFilterColorCellsPicker
.
updateColors
(
colors
);
this
.
miSortCellColor
.
setVisible
(
true
);
this
.
miFilterCellColor
.
setVisible
(
true
);
}
else
{
this
.
miSortCellColor
.
setVisible
(
false
);
this
.
miFilterCellColor
.
setVisible
(
false
);
}
// this.chCustomFilter.setValue(isCustomFilter);
// this.chCustomFilter.setValue(isCustomFilter);
this
.
btnOk
.
setDisabled
(
isCustomFilter
);
this
.
btnOk
.
setDisabled
(
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