Don't crash when logo passed as integer (#1319)

This commit is contained in:
Daniel Lo Nigro
2018-01-04 16:11:59 -08:00
committed by Paul Melnikow
parent e91c9fc7ab
commit 02683afd04
2 changed files with 22 additions and 3 deletions

View File

@@ -20,7 +20,11 @@ function isDataUri(s) {
function prependPrefix(s, prefix) {
if (s === undefined) {
return undefined;
} else if (s.startsWith(prefix)) {
}
s = '' + s;
if (s.startsWith(prefix)) {
return s;
} else {
return prefix + s;
@@ -59,8 +63,10 @@ function makeLabel(defaultLabel, overrides) {
}
function makeLogo(defaultNamedLogo, overrides) {
const maybeDataUri = prependPrefix(overrides.logo, 'data:');
const maybeNamedLogo = overrides.logo === undefined ? defaultNamedLogo : overrides.logo;
const logo = 'logo' in overrides ? '' + overrides.logo : undefined;
const maybeDataUri = prependPrefix(logo, 'data:');
const maybeNamedLogo = logo === undefined ? defaultNamedLogo : logo;
if (isDataUri(maybeDataUri)) {
return maybeDataUri;