From a9cdf0259db0e4aadcf032a48624898a78656a5b Mon Sep 17 00:00:00 2001 From: Alexander Rose <alexander.rose@weirdbyte.de> Date: Fri, 31 May 2019 00:27:48 -0700 Subject: [PATCH] fix default color in uniform theme --- src/mol-theme/color/uniform.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mol-theme/color/uniform.ts b/src/mol-theme/color/uniform.ts index c18b62c9a..0548dbd58 100644 --- a/src/mol-theme/color/uniform.ts +++ b/src/mol-theme/color/uniform.ts @@ -1,5 +1,5 @@ /** - * Copyright (c) 2018 mol* contributors, licensed under MIT, See LICENSE file for more info. + * Copyright (c) 2018-2019 mol* contributors, licensed under MIT, See LICENSE file for more info. * * @author Alexander Rose <alexander.rose@weirdbyte.de> */ @@ -9,6 +9,7 @@ import { Color } from 'mol-util/color'; import { ParamDefinition as PD } from 'mol-util/param-definition' import { ThemeDataContext } from '../theme'; import { TableLegend } from 'mol-util/color/tables'; +import { defaults } from 'mol-util'; const DefaultColor = Color(0xCCCCCC) const Description = 'Gives everything the same, uniform color.' @@ -22,7 +23,7 @@ export function getUniformColorThemeParams(ctx: ThemeDataContext) { } export function UniformColorTheme(ctx: ThemeDataContext, props: PD.Values<UniformColorThemeParams>): ColorTheme<UniformColorThemeParams> { - const color = props.value || DefaultColor + const color = defaults(props.value, DefaultColor) return { factory: UniformColorTheme, -- GitLab