1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00

review fixes, plus unbreak to work with new webpack layout

This commit is contained in:
Matthew Hodgson
2017-01-18 14:06:47 +00:00
parent a0bbe3a306
commit 3d30553b7f
3 changed files with 123 additions and 96 deletions

View File

@@ -174,7 +174,7 @@ module.exports = {
tintables.push(tintable);
},
tint: function(primaryColor, secondaryColor, tertiaryColor, whiteColor) {
tint: function(primaryColor, secondaryColor, tertiaryColor) {
if (!cached) {
calcCssFixups();
@@ -205,19 +205,16 @@ module.exports = {
tertiaryColor = rgbToHex(rgb1);
}
if (!whiteColor) {
whiteColor = colors[3];
}
if (colors[0] === primaryColor &&
colors[1] === secondaryColor &&
colors[2] === tertiaryColor &&
colors[3] === whiteColor)
colors[2] === tertiaryColor)
{
return;
}
colors = [primaryColor, secondaryColor, tertiaryColor, whiteColor];
colors[0] = primaryColor;
colors[1] = secondaryColor;
colors[2] = tertiaryColor;
if (DEBUG) console.log("Tinter.tint");
@@ -231,6 +228,19 @@ module.exports = {
});
},
tintSvgWhite: function(whiteColor) {
if (!whiteColor) {
whiteColor = colors[3];
}
if (colors[3] === whiteColor) {
return;
}
colors[3] = whiteColor;
tintables.forEach(function(tintable) {
tintable();
});
},
// XXX: we could just move this all into TintableSvg, but as it's so similar
// to the CSS fixup stuff in Tinter (just that the fixups are stored in TintableSvg)
// keeping it here for now.