From 3543faa0c202375ae60c8c94216fb2956712f07c Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Sat, 9 May 2020 11:03:58 -0700
Subject: [PATCH] fix snapshot loading
---
src/apps/viewer/index.html | 2 +-
src/mol-plugin-state/manager/snapshots.ts | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/apps/viewer/index.html b/src/apps/viewer/index.html
index b1607d28c..7c28bd24a 100644
--- a/src/apps/viewer/index.html
+++ b/src/apps/viewer/index.html
@@ -59,7 +59,7 @@
if (snapshotId) viewer.setRemoteSnapshot(snapshotId);
var snapshotUrl = getParam('snapshot-url', '[^&]+').trim();
- var snapshotUrlType = getParam('snapshot-url-type', '[^&]+').toLowerCase().trim();
+ var snapshotUrlType = getParam('snapshot-url-type', '[^&]+').toLowerCase().trim() || 'molj';
if (snapshotUrl && snapshotUrlType) viewer.loadSnapshotFromUrl(snapshotUrl, snapshotUrlType);
var structureUrl = getParam('structure-url', '[^&]+').trim();
diff --git a/src/mol-plugin-state/manager/snapshots.ts b/src/mol-plugin-state/manager/snapshots.ts
index cd08c7d1a..0dea14c10 100644
--- a/src/mol-plugin-state/manager/snapshots.ts
+++ b/src/mol-plugin-state/manager/snapshots.ts
@@ -231,6 +231,8 @@ class PluginStateSnapshotManager extends StatefulPluginComponent<{
if (PluginStateSnapshotManager.isStateSnapshot(snapshot)) {
return this.setStateSnapshot(snapshot);
+ } else if (PluginStateSnapshotManager.isStateSnapshot(snapshot.data)) {
+ return this.setStateSnapshot(snapshot.data);
} else {
this.plugin.state.setSnapshot(snapshot);
}
@@ -330,7 +332,7 @@ namespace PluginStateSnapshotManager {
snapshot: PluginState.Snapshot
}
- export function Entry(snapshot: PluginState.Snapshot, params: {name?: string, description?: string }): Entry {
+ export function Entry(snapshot: PluginState.Snapshot, params: { name?: string, description?: string }): Entry {
return { timestamp: +new Date(), snapshot, ...params };
}
--
GitLab