Commit 29f695b1 authored by GoshaZotov's avatar GoshaZotov Committed by Alexander.Trofimov

add check(get filter colors)

parent f1b8e06e
......@@ -12804,6 +12804,13 @@
res.fontColors.push(ascFontColor);
alreadyAddFontColors[fontColor.rgb] = true;
}
else if(null === fontColor && true !== alreadyAddFontColors[g_oDefaultFont.c.rgb])
{
var ascFontColor = getAscColor(g_oDefaultFont.c);
res.fontColors.push(ascFontColor);
alreadyAddFontColors[g_oDefaultFont.c.rgb] = true;
}
}
}
else
......@@ -12816,6 +12823,13 @@
res.fontColors.push(ascFontColor);
alreadyAddFontColors[fontColor.rgb] = true;
}
else if(null === fontColor && true !== alreadyAddFontColors[g_oDefaultFont.c.rgb])
{
var ascFontColor = getAscColor(g_oDefaultFont.c);
res.fontColors.push(ascFontColor);
alreadyAddFontColors[g_oDefaultFont.c.rgb] = true;
}
}
var color = cell.getStyle();
......@@ -12833,7 +12847,17 @@
res.colors.push(null);
}
}
//если один элемент в массиве, не отправляем его в меню
if(res.colors.length === 1)
{
res.colors = [];
}
if(res.fontColors.length === 1)
{
res.fontColors = [];
}
if(tempDigit > tempText)
{
res.text = false;
......
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