From cef0911950ca8fdf6c6846428ef709aac1e0ff83 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 11 Mar 2024 16:21:07 +0000 Subject: [PATCH] Fix merge --- .../common/bindings/BindingPanel.svelte | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 67d7e578b1..96a2187755 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -172,16 +172,8 @@ const updateValue = val => { const runtimeExpression = readableToRuntimeBinding(enrichedBindings, val) -<<<<<<< HEAD - valid = isValid(runtimeExpression) - if (valid) { - dispatch("change", val) - requestEval(runtimeExpression, context, snippets) - } -======= dispatch("change", val) - requestUpdateEvaluation(runtimeExpression, context) ->>>>>>> fe12a8606438d41437e21729068b91038ba6df37 + requestEval(runtimeExpression, context, snippets) } const onSelectHelper = (helper, js) => { @@ -232,7 +224,6 @@ jsValue = encodeJSBinding(e.detail) updateValue(jsValue) } -<<<<<<< HEAD onMount(() => { // Set the initial mode appropriately @@ -245,12 +236,7 @@ // Set the initial side panel sidePanel = sidePanelOptions[0] - - // Determine if our initial value is valid - valid = isValid(readableToRuntimeBinding(enrichedBindings, value)) }) -======= ->>>>>>> fe12a8606438d41437e21729068b91038ba6df37