MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge

This commit is contained in:
Andrew Kingston 2024-03-11 16:21:07 +00:00
parent 1a8a649be4
commit cef0911950
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/builder/src/components/common/bindings/BindingPanel.svelte
View File

@ -172,17 +172,9 @@
const updateValue = val => { const updateValue = val => {
const runtimeExpression = readableToRuntimeBinding(enrichedBindings, val) const runtimeExpression = readableToRuntimeBinding(enrichedBindings, val)
<<<<<<< HEAD
valid = isValid(runtimeExpression)
if (valid) {
dispatch("change", val) dispatch("change", val)
requestEval(runtimeExpression, context, snippets) requestEval(runtimeExpression, context, snippets)
} }
=======
dispatch("change", val)
requestUpdateEvaluation(runtimeExpression, context)
>>>>>>> fe12a8606438d41437e21729068b91038ba6df37
}
const onSelectHelper = (helper, js) => { const onSelectHelper = (helper, js) => {
bindingHelpers.onSelectHelper(js ? jsValue : hbsValue, helper, { js }) bindingHelpers.onSelectHelper(js ? jsValue : hbsValue, helper, { js })
@ -232,7 +224,6 @@
jsValue = encodeJSBinding(e.detail) jsValue = encodeJSBinding(e.detail)
updateValue(jsValue) updateValue(jsValue)
} }
<<<<<<< HEAD
onMount(() => { onMount(() => {
// Set the initial mode appropriately // Set the initial mode appropriately
@ -245,12 +236,7 @@
// Set the initial side panel // Set the initial side panel
sidePanel = sidePanelOptions[0] sidePanel = sidePanelOptions[0]
// Determine if our initial value is valid
valid = isValid(readableToRuntimeBinding(enrichedBindings, value))
}) })
=======
>>>>>>> fe12a8606438d41437e21729068b91038ba6df37
</script> </script>
<DrawerContent padding={false}> <DrawerContent padding={false}>