sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

load scene from localStorage in collaboration if user is first… (#1036)

Browse Source 
* load scene from localStorage in collaboration if user is first in room

* load scene from localStorage in collaboration prior to syncing with server

* fix merge

Co-authored-by: dwelle <luzar.david@gmail.com>
This commit is contained in:
Edwin Lin 2020-03-22 10:41:05 -07:00 committed by GitHub
parent ba3cec8d0d
commit f1160a1534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/App.tsx
View File

@ -351,13 +351,14 @@ export class App extends React.Component<any, AppState> {
return; return;
} }
const scene = await loadScene(null);
this.syncActionResult(scene);
const roomMatch = getCollaborationLinkData(window.location.href); const roomMatch = getCollaborationLinkData(window.location.href);
if (roomMatch) { if (roomMatch) {
this.initializeSocketClient(); this.initializeSocketClient();
return; return;
} }
const scene = await loadScene(null);
this.syncActionResult(scene);
window.addEventListener("beforeunload", this.beforeUnload); window.addEventListener("beforeunload", this.beforeUnload);
} }

2
src/i18n.ts
View File

@ -10,7 +10,7 @@ export const languages = [
label: "Bahasa Indonesia", label: "Bahasa Indonesia",
data: require("./locales/id-ID.json"), data: require("./locales/id-ID.json"),
}, },
{ lng: "hu-HU", label: "Magyar", data: require("./locales/hu-HU.json") }, { lng: "hu-HU", label: "Magyar", data: require("./locales/hu-HU.json") },
{ lng: "no-No", label: "Norsk", data: require("./locales/no-NO.json") }, { lng: "no-No", label: "Norsk", data: require("./locales/no-NO.json") },
{ lng: "pl-PL", label: "Polski", data: require("./locales/pl-PL.json") }, { lng: "pl-PL", label: "Polski", data: require("./locales/pl-PL.json") },
{ lng: "pt-PT", label: "Português", data: require("./locales/pt-PT.json") }, { lng: "pt-PT", label: "Português", data: require("./locales/pt-PT.json") },