aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2020-08-15 16:55:54 -0400
committerbobzel <zzzman@gmail.com>2020-08-15 16:55:54 -0400
commite4185e8de50d7388ace1bf6850867ad754e5feef (patch)
tree8113b35ce239d9627ce38cf662e244d6fd0aba9d
parente9f8804a68327c64e1ade13081cab0b3b6c0ce21 (diff)
trying a fix to infinite loop in docking view config updating by removing fetchProto when field was already cached. Also cleared out the sidebarContent on load to prevent shared text documents from getting too tall.
-rw-r--r--src/client/DocServer.ts2
-rw-r--r--src/client/views/MainView.tsx1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index 63e01bc5b..dde75497c 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -261,7 +261,7 @@ export namespace DocServer {
} else {
// CACHED => great, let's just return the cached field we have
return Promise.resolve(cached).then(field => {
- (field instanceof Doc) && fetchProto(field);
+ //(field instanceof Doc) && fetchProto(field);
return field;
});
}
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 5a9d95aac..ec43e6e1d 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -145,6 +145,7 @@ export class MainView extends React.Component {
constructor(props: Readonly<{}>) {
super(props);
MainView.Instance = this;
+ this.sidebarContent.proto = undefined;
this._urlState = HistoryUtil.parseUrl(window.location) || {} as any;
// causes errors to be generated when modifying an observable outside of an action