strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loleaflet: no fill or automatic color handling in color picker

Browse source 
Change-Id: Iab98aadf54f0c1b041fe46eb2be1a798662d935b
This commit is contained in:
Andras Timar 2018-07-02 16:53:16 +02:00
parent 68ce5cac97
commit 3f0f2c671c
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
loleaflet/js/toolbar.js
View file

@ -216,10 +216,10 @@ function onClick(e, id, item, subItem) {
else if (id === 'insertgraphic') {
L.DomUtil.get('insertgraphic').click();
}
else if (id === 'fontcolor' && e.color) {
else if (id === 'fontcolor' && typeof e.color !== 'undefined') {
onColorPick(id, e.color);
}
else if (id === 'backcolor' && e.color) {
else if (id === 'backcolor' && typeof e.color !== 'undefined') {
onColorPick(id, e.color)
}
else if (id === 'sum') {
@ -544,11 +544,17 @@ function insertShapes() {
}
function onColorPick(id, color) {
if (map.getPermission() !== 'edit' || color === undefined) {
if (map.getPermission() !== 'edit') {
return;
}
// no fill or automatic color is -1
if (color === '') {
color = -1;
}
// transform from #FFFFFF to an Int
color = parseInt(color.replace('#', ''), 16);
else {
color = parseInt(color.replace('#', ''), 16);
}
var command = {};
var fontcolor, backcolor;
if (id === 'fontcolor') {