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

Merge branch 'develop' into feature/color-palette

Browse source
This commit is contained in:
Julia Radzhabova 2022-04-25 21:27:49 +03:00
parent ad74306672 bbb3b053f5
commit 6442c8b619
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -180,6 +180,7 @@ define([
if (color) { // custom color was selected if (color) { // custom color was selected
color = color.toUpperCase(); color = color.toUpperCase();
selected.removeClass(this.selectedCls); selected.removeClass(this.selectedCls);
this.lastSelectedIdx = -1;
} }
var colors = Common.localStorage.getItem('asc.'+Common.localStorage.getId()+'.colors.custom'); var colors = Common.localStorage.getItem('asc.'+Common.localStorage.getId()+'.colors.custom');
@ -198,7 +199,15 @@ define([
color = undefined; //select only first found color color = undefined; //select only first found color
} }
} }
while (i < this.options.dynamiccolors) {
colorEl = el.find('.color-dynamic-'+ i);
colorEl.removeAttr('color');
colorEl.addClass('dynamic-empty-color');
colorEl.find('span').css({
'background-color': 'transparent'
});
i++;
}
el.find('.palette-color-dynamiccolors').toggleClass(this.emptyColorsClass, c===0); el.find('.palette-color-dynamiccolors').toggleClass(this.emptyColorsClass, c===0);
} }
}, },