From 2c5253943ceba05a23499a3d1fefc244e038448c Mon Sep 17 00:00:00 2001
From: Alexander Rose <alex.rose@rcsb.org>
Date: Wed, 11 Mar 2020 18:22:16 -0700
Subject: [PATCH] lint and test fixes
---
src/mol-gl/_spec/renderable.spec.ts | 5 +++--
src/mol-state/state.ts | 14 ++++++--------
src/mol-util/data-source.ts | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/mol-gl/_spec/renderable.spec.ts b/src/mol-gl/_spec/renderable.spec.ts
index ab0f26a50..6d5118f10 100644
--- a/src/mol-gl/_spec/renderable.spec.ts
+++ b/src/mol-gl/_spec/renderable.spec.ts
@@ -5,6 +5,7 @@
*/
import { calculateBoundingSphere } from '../renderable/util';
+import { Vec3 } from '../../mol-math/linear-algebra';
describe('renderable', () => {
it('calculateBoundingSphere', () => {
@@ -34,7 +35,7 @@ describe('renderable', () => {
transform, transform.length / 16
)
- expect(boundingSphere.radius).toBe(1.5)
- expect(boundingSphere.center).toEqual([1.5, 0.0, 0.0])
+ expect(boundingSphere.radius).toBeCloseTo(1.58, 2)
+ expect(Vec3.equals(boundingSphere.center, Vec3.create(1.418367, 0, 0))).toBe(true)
})
})
diff --git a/src/mol-state/state.ts b/src/mol-state/state.ts
index fe6c4291a..6231870a8 100644
--- a/src/mol-state/state.ts
+++ b/src/mol-state/state.ts
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2018-2019 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
*
* @author David Sehnal <david.sehnal@gmail.com>
*/
@@ -154,13 +154,11 @@ class State {
}
if (isNested) throw e;
} finally {
- if (isNested) {
- return;
+ if (!isNested) {
+ this.inTransaction = false;
+ this.events.changed.next({ state: this, inTransaction: false });
+ this.events.isUpdating.next(false);
}
-
- this.inTransaction = false;
- this.events.changed.next({ state: this, inTransaction: false });
- this.events.isUpdating.next(false);
}
});
}
@@ -714,7 +712,7 @@ function resolveParams(ctx: UpdateContext, transform: StateTransform, src: State
const prms = transform.transformer.definition.params;
const definition = prms ? prms(src, ctx.parent.globalContext) : {};
const defaultValues = ParamDefinition.getDefaultValues(definition);
- (transform.params as any) = transform.params
+ (transform.params as any) = transform.params
? assignIfUndefined(transform.params, defaultValues)
: defaultValues;
return { definition, values: transform.params };
diff --git a/src/mol-util/data-source.ts b/src/mol-util/data-source.ts
index 402a023df..5568bf8a2 100644
--- a/src/mol-util/data-source.ts
+++ b/src/mol-util/data-source.ts
@@ -79,7 +79,7 @@ function genericError(isDownload: boolean) {
}
function readData<T extends XMLHttpRequest | FileReader>(ctx: RuntimeContext, action: string, data: T): Promise<T> {
- return new Promise<T>((resolve, reject) => {
+ return new Promise<T>((resolve, reject) => {
// first check if data reading is already done
if (isDone(data)) {
const { error } = data as FileReader;
--
GitLab