Fix merge
This commit is contained in:
parent
1a8a649be4
commit
cef0911950
|
@ -172,17 +172,9 @@
|
|||
|
||||
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
|
||||
}
|
||||
|
||||
const onSelectHelper = (helper, js) => {
|
||||
bindingHelpers.onSelectHelper(js ? jsValue : hbsValue, 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
|
||||
</script>
|
||||
|
||||
<DrawerContent padding={false}>
|
||||
|
|
Loading…
Reference in New Issue