Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[Color palette] Hide recent color by default

Browse source
This commit is contained in:
Julia Radzhabova 2022-04-28 12:53:33 +03:00
parent 5b2a65d2cb
commit ac5a4a1018
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/main/lib/component/ColorButton.js
View file

@ -55,13 +55,15 @@ define([
getPicker: function(color, colors) { getPicker: function(color, colors) {
if (!this.colorPicker) { if (!this.colorPicker) {
this.colorPicker = new Common.UI.ThemeColorPalette({ var config = {
el: this.cmpEl.find('#' + this.menu.id + '-color-menu'), el: this.cmpEl.find('#' + this.menu.id + '-color-menu'),
transparent: this.options.transparent,
hideEmptyColors: this.options.hideEmptyColors,
value: color, value: color,
colors: colors colors: colors
}); };
(this.options.transparent!==undefined) && (config['transparent'] = this.options.transparent);
(this.options.hideEmptyColors!==undefined) && (config['hideEmptyColors'] = this.options.hideEmptyColors);
this.colorPicker = new Common.UI.ThemeColorPalette(config);
this.colorPicker.on('select', _.bind(this.onColorSelect, this)); this.colorPicker.on('select', _.bind(this.onColorSelect, this));
this.cmpEl.find('#' + this.menu.id + '-color-new').on('click', _.bind(this.addNewColor, this)); this.cmpEl.find('#' + this.menu.id + '-color-new').on('click', _.bind(this.addNewColor, this));
if (this.options.auto) { if (this.options.auto) {

2
apps/common/main/lib/component/ThemeColorPalette.js
View file

@ -54,7 +54,7 @@ define([
themecolors: 10, themecolors: 10,
columns: 10, columns: 10,
effects: 5, effects: 5,
hideEmptyColors: false, hideEmptyColors: true,
allowReselect: true, allowReselect: true,
transparent: false, transparent: false,
value: '000000', value: '000000',

1
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -377,7 +377,6 @@ define([
split: true, split: true,
menu: true, menu: true,
auto: true, auto: true,
hideEmptyColors: true,
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: '0, -16' dataHintOffset: '0, -16'