various tweaks

src/mol-canvas3d/camera.ts

@@ -250,7 +250,7 @@ function updateOrtho(camera: Camera) {
     let top = cy + dy
     let bottom = cy - dy
 
-    if (viewOffset && viewOffset.enabled) {
+    if (viewOffset.enabled) {
         const zoomW = zoom / (viewOffset.width / viewOffset.fullWidth)
         const zoomH = zoom / (viewOffset.height / viewOffset.fullHeight)
         const scaleW = (fullRight - fullLeft) / viewOffset.width
@@ -279,7 +279,7 @@ function updatePers(camera: Camera) {
     let width = aspect * height
     let left = -0.5 * width
 
-    if (viewOffset && viewOffset.enabled) {
+    if (viewOffset.enabled) {
         left += viewOffset.offsetX * width / viewOffset.fullWidth
         top -= viewOffset.offsetY * height / viewOffset.fullHeight
         width *= viewOffset.width / viewOffset.fullWidth

src/mol-plugin/component.ts

@@ -8,7 +8,7 @@ import { shallowMergeArray } from '../mol-util/object';
 import { RxEventHelper } from '../mol-util/rx-event-helper';
 
 export class PluginComponent<State> {
-    private _ev: RxEventHelper;
+    private _ev: RxEventHelper | undefined;
 
     protected get ev() {
         return this._ev || (this._ev = RxEventHelper.create());

src/mol-plugin/layout.ts

@@ -54,7 +54,7 @@ export class PluginLayout extends PluginComponent<PluginLayoutStateProps> {
         this.events.updated.next();
     }
 
-    private root: HTMLElement;
+    private root: HTMLElement | undefined;
     private rootState: RootState | undefined = void 0;
     private expandedViewport: HTMLMetaElement;
 
@@ -78,7 +78,7 @@ export class PluginLayout extends PluginComponent<PluginLayoutStateProps> {
             let body = document.getElementsByTagName('body')[0];
             let head = document.getElementsByTagName('head')[0];
 
-            if (!body || !head) return;
+            if (!body || !head || !this.root) return;
 
             if (this.state.isExpanded) {
                 let children = head.children;

src/mol-plugin/state.ts

@@ -53,12 +53,10 @@ class PluginState {
             camera: p.camera ? {
                 current: this.plugin.canvas3d.camera.getSnapshot(),
                 transitionStyle: p.cameraTranstion.name,
-                transitionDurationInMs: (params && params.cameraTranstion && params.cameraTranstion.name === 'animate' && params.cameraTranstion.params.durationInMs) || void 0
+                transitionDurationInMs: (params && params.cameraTranstion && params.cameraTranstion.name === 'animate') ? params.cameraTranstion.params.durationInMs : undefined
             } : void 0,
             cameraSnapshots: p.cameraSnapshots ? this.cameraSnapshots.getStateSnapshot() : void 0,
-            canvas3d: p.canvas3d ? {
-                props: this.plugin.canvas3d.props
-            } : void 0,
+            canvas3d: p.canvas3d ? { props: this.plugin.canvas3d.props } : void 0,
             durationInMs: params && params.durationInMs
         };
     }
@@ -69,7 +67,7 @@ class PluginState {
         if (snapshot.behaviour) await this.plugin.runTask(this.behaviorState.setSnapshot(snapshot.behaviour));
         if (snapshot.data) await this.plugin.runTask(this.dataState.setSnapshot(snapshot.data));
         if (snapshot.canvas3d) {
-            if (snapshot.canvas3d.props) await PluginCommands.Canvas3D.SetSettings.dispatch(this.plugin, { settings: snapshot.canvas3d.props || { } });
+            if (snapshot.canvas3d.props) await PluginCommands.Canvas3D.SetSettings.dispatch(this.plugin, { settings: snapshot.canvas3d.props });
         }
         if (snapshot.cameraSnapshots) this.cameraSnapshots.setStateSnapshot(snapshot.cameraSnapshots);
         if (snapshot.animation) {

src/mol-plugin/util/interactivity.ts

@@ -176,7 +176,7 @@ namespace Interactivity {
                 } else if (modifiers.shift && buttons === ButtonsType.Flag.Primary) {
                     // try to extend sequence on Shift + Left-Click
                     let loci: StructureElement.Loci = normalized.loci;
-                    if (modifiers && modifiers.shift) {
+                    if (modifiers.shift) {
                         loci = this.sel.tryGetRange(loci) || loci;
                     }
                     this.toggleSel({ loci, repr: normalized.repr });

src/mol-task/task.ts

@@ -34,8 +34,8 @@ namespace Task {
     class Impl<T> implements Task<T> {
         readonly id: number;
 
-        run(observer?: Progress.Observer, updateRateMs?: number): Promise<T> {
-            if (observer) return ExecuteObservable(this, observer, updateRateMs as number || 250);
+        run(observer?: Progress.Observer, updateRateMs = 250): Promise<T> {
+            if (observer) return ExecuteObservable(this, observer, updateRateMs);
             return this.f(SyncRuntimeContext);
         }
 

src/mol-util/monadic-parser.ts

@@ -323,10 +323,9 @@ export namespace MonadicParser {
         return RegExp('^(?:' + re.source + ')', flags(re));
     }
 
-    export function regexp(re: RegExp, groupNumber?: number) {
+    export function regexp(re: RegExp, group = 0) {
         const anchored = anchoredRegexp(re);
         const expected = '' + re;
-        const group = groupNumber || 0;
         return new MonadicParser(function (input, i) {
             const match = anchored.exec(input.slice(i));
             if (match) {

src/mol-util/param-definition.ts

@@ -293,8 +293,6 @@ export namespace ParamDefinition {
             return areEqual(p.params, a, b);
         } else if (p.type === 'mapped') {
             const u = a as NamedParams, v = b as NamedParams;
-            if (!u) return !v;
-            if (!u || !v) return false;
             if (u.name !== v.name) return false;
             const map = p.map(u.name);
             return isParamEqual(map, u.params, v.params);