Commit 08f6ca85 authored by Julia Radzhabova's avatar Julia Radzhabova

[SSE] Изменения в подсветке дефолтного цвета шрифта для фильтров и сортировки.

parent 43fc089b
/*
*
* (c) Copyright Ascensio System Limited 2010-2016
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
/** /**
* ColorPaletteExt.js * ColorPaletteExt.js
* *
......
...@@ -1067,7 +1067,7 @@ define([ ...@@ -1067,7 +1067,7 @@ define([
this.miFilterFontColor.setChecked(false, true); this.miFilterFontColor.setChecked(false, true);
this.miSortFontColor.setChecked(sort == Asc.c_oAscSortOptions.ByColorFont, true); this.miSortFontColor.setChecked(sort == Asc.c_oAscSortOptions.ByColorFont, true);
if (sort == Asc.c_oAscSortOptions.ByColorFont) if (sort == Asc.c_oAscSortOptions.ByColorFont)
this.mnuSortColorFontPicker.select(sortColor, true); this.mnuSortColorFontPicker.select((sortColor) ? sortColor : '000000', true);
} }
hasColors = (colorsFill && colorsFill.length>0); hasColors = (colorsFill && colorsFill.length>0);
...@@ -1122,7 +1122,7 @@ define([ ...@@ -1122,7 +1122,7 @@ define([
this.mnuFilterColorCellsPicker.select((filterColor) ? filterColor : 'transparent', true); this.mnuFilterColorCellsPicker.select((filterColor) ? filterColor : 'transparent', true);
} else if (colorFilter.asc_getCellColor()===false) { // font color } else if (colorFilter.asc_getCellColor()===false) { // font color
this.miFilterFontColor.setChecked(true, true); this.miFilterFontColor.setChecked(true, true);
this.mnuFilterColorFontPicker.select(filterColor, true); this.mnuFilterColorFontPicker.select((filterColor) ? filterColor : '000000', true);
} }
} else if (isDynamicFilter || isTop10) { } else if (isDynamicFilter || isTop10) {
var dynType = (isDynamicFilter) ? filterObj.asc_getFilter().asc_getType() : null, var dynType = (isDynamicFilter) ? filterObj.asc_getFilter().asc_getType() : null,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment