load scene from localStorage in collaboration if user is first… (#1036)
* 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:
parent
ba3cec8d0d
commit
f1160a1534
@ -351,13 +351,14 @@ export class App extends React.Component<any, AppState> {
|
||||
return;
|
||||
}
|
||||
|
||||
const scene = await loadScene(null);
|
||||
this.syncActionResult(scene);
|
||||
|
||||
const roomMatch = getCollaborationLinkData(window.location.href);
|
||||
if (roomMatch) {
|
||||
this.initializeSocketClient();
|
||||
return;
|
||||
}
|
||||
const scene = await loadScene(null);
|
||||
this.syncActionResult(scene);
|
||||
|
||||
window.addEventListener("beforeunload", this.beforeUnload);
|
||||
}
|
||||
|
@ -10,7 +10,7 @@ export const languages = [
|
||||
label: "Bahasa Indonesia",
|
||||
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: "pl-PL", label: "Polski", data: require("./locales/pl-PL.json") },
|
||||
{ lng: "pt-PT", label: "Português", data: require("./locales/pt-PT.json") },
|
||||
|
Loading…
x
Reference in New Issue
Block a user