From c1f7bb7c04e9f657cd6364c6f25c4b4a0f06f656 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 22 Dec 2023 18:17:36 +0100 Subject: [PATCH] fix: fix multiplayer --- frontend/src/lib/components/Editor.svelte | 3 +-- frontend/src/lib/components/InputTransformForm.svelte | 8 -------- frontend/src/lib/components/ScriptEditor.svelte | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte index f61683b4d1..4e71820e3a 100644 --- a/frontend/src/lib/components/Editor.svelte +++ b/frontend/src/lib/components/Editor.svelte @@ -990,7 +990,7 @@ let model: meditor.ITextModel | undefined = undefined let monacoBinding: MonacoBinding | undefined = undefined - + $: if (yContent && awareness && model && editor) { monacoBinding && monacoBinding.destroy() monacoBinding = new MonacoBinding( @@ -1211,7 +1211,6 @@ let root = hostname + '/api/scripts_u/tokened_raw/' + $workspaceStore + '/' + token return root } - console.log('FOO') diff --git a/frontend/src/lib/components/InputTransformForm.svelte b/frontend/src/lib/components/InputTransformForm.svelte index 8a03164bee..10af57e3b0 100644 --- a/frontend/src/lib/components/InputTransformForm.svelte +++ b/frontend/src/lib/components/InputTransformForm.svelte @@ -99,7 +99,6 @@ arg.type = 'static' } if (arg.type) { - console.log('??', arg.type) propertyType = arg.type } } @@ -112,7 +111,6 @@ function connectProperty(rawValue: string) { arg.expr = getDefaultExpr(undefined, previousModuleId, rawValue) arg.type = 'javascript' - console.log('C') propertyType = 'javascript' monaco?.setCode(arg.expr) } @@ -123,7 +121,6 @@ const toAppend = `\$\{${path}}` arg.value = `${arg.value ?? ''}${toAppend}` monacoTemplate?.setCode(arg.value) - console.log('D') setPropertyType(arg.value) argInput?.focus() return false @@ -132,7 +129,6 @@ focusProp(argName, 'insert', (path) => { arg.expr = path arg.type = 'javascript' - console.log('E') propertyType = 'javascript' monaco?.setCode(arg.expr) return true @@ -192,9 +188,7 @@ { - console.log('FOOO') if (e.detail == propertyType) return - console.log(e.detail, propertyType) const staticTemplate = isStaticTemplate(inputCat) if (e.detail === 'javascript') { if (arg.expr == undefined) { @@ -213,7 +207,6 @@ arg.type = 'javascript' } propertyType = 'javascript' - console.log('H', arg.expr) } else { if (staticTemplate) { if (arg) { @@ -229,7 +222,6 @@ } } propertyType = 'static' - console.log('F', propertyType) } }} > diff --git a/frontend/src/lib/components/ScriptEditor.svelte b/frontend/src/lib/components/ScriptEditor.svelte index cbc425b283..49920435ad 100644 --- a/frontend/src/lib/components/ScriptEditor.svelte +++ b/frontend/src/lib/components/ScriptEditor.svelte @@ -201,7 +201,7 @@ } function collabUrl() { - let url = new URL(window.location.toString()) + let url = new URL(window.location.toString().split('#')[0]) url.search = '' return `${url}?collab=1` + (edit ? '' : `&path=${path}`) }