Explorar el Código

fix snapshot loading

Alexander Rose hace 4 años
padre
commit
3543faa0c2
Se han modificado 2 ficheros con 4 adiciones y 2 borrados
  1. 1 1
      src/apps/viewer/index.html
  2. 3 1
      src/mol-plugin-state/manager/snapshots.ts

+ 1 - 1
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();

+ 3 - 1
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 };
     }