From 171cda89feae11bbe803292ca2f145fd49491a1c Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Tue, 19 Feb 2019 13:52:15 -0800
Subject: [PATCH] cleanup
---
src/mol-repr/representation.ts | 6 +-----
src/mol-theme/color.ts | 5 ++---
src/mol-theme/size.ts | 3 ++-
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/mol-repr/representation.ts b/src/mol-repr/representation.ts
index 5032bef59..8900e9ee1 100644
--- a/src/mol-repr/representation.ts
+++ b/src/mol-repr/representation.ts
@@ -188,11 +188,7 @@ namespace Representation {
}
return renderObjects
},
- get props() {
- const props = {}
- reprList.forEach(r => Object.assign(props, r.props))
- return props as P
- },
+ get props() { return currentProps },
get params() { return currentParams },
createOrUpdate: (props: Partial<P> = {}, data?: D) => {
if (data && data !== currentData) {
diff --git a/src/mol-theme/color.ts b/src/mol-theme/color.ts
index ba17219d3..33f4c9e3c 100644
--- a/src/mol-theme/color.ts
+++ b/src/mol-theme/color.ts
@@ -29,8 +29,6 @@ import { TableLegend } from 'mol-util/color/tables';
export type LocationColor = (location: Location, isSecondary: boolean) => Color
-export type ColorThemeProps = { [k: string]: any }
-
export { ColorTheme }
interface ColorTheme<P extends PD.Params> {
readonly factory: ColorTheme.Factory<P>
@@ -75,4 +73,5 @@ export const BuiltInColorThemes = {
'shape-group': ShapeGroupColorThemeProvider,
'unit-index': UnitIndexColorThemeProvider,
'uniform': UniformColorThemeProvider,
-}
\ No newline at end of file
+}
+export type BuiltInColorThemeName = keyof typeof BuiltInColorThemes
\ No newline at end of file
diff --git a/src/mol-theme/size.ts b/src/mol-theme/size.ts
index 52469b7a1..c0dbbe3e3 100644
--- a/src/mol-theme/size.ts
+++ b/src/mol-theme/size.ts
@@ -43,4 +43,5 @@ export const BuiltInSizeThemes = {
'physical': PhysicalSizeThemeProvider,
'shape-group': ShapeGroupSizeThemeProvider,
'uniform': UniformSizeThemeProvider
-}
\ No newline at end of file
+}
+export type BuiltInSizeThemeName = keyof typeof BuiltInSizeThemes
\ No newline at end of file
--
GitLab