CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-04 03:54:37 +13:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix/remove-db-head-requests

Browse source
This commit is contained in:
Michael Drury 2024-01-11 16:49:06 +00:00 committed by GitHub
commit 649113b622
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/bbui/src/Modal/ModalContent.svelte
View file

@ -40,7 +40,7 @@
loading = false loading = false
} }
async function confirm() { export async function confirm() {
loading = true loading = true
if (!onConfirm || (await onConfirm()) !== keepOpen) { if (!onConfirm || (await onConfirm()) !== keepOpen) {
hide() hide()

4
packages/builder/src/components/design/ScreenDetailsModal.svelte
View file

@ -13,6 +13,7 @@
const appPrefix = "/app" const appPrefix = "/app"
let touched = false let touched = false
let error let error
let modal
$: appUrl = screenUrl $: appUrl = screenUrl
? `${window.location.origin}${appPrefix}${screenUrl}` ? `${window.location.origin}${appPrefix}${screenUrl}`
@ -50,6 +51,7 @@
</script> </script>
<ModalContent <ModalContent
bind:this={modal}
size="M" size="M"
title={"Screen details"} title={"Screen details"}
{confirmText} {confirmText}
@ -58,6 +60,7 @@
cancelText={"Back"} cancelText={"Back"}
disabled={!screenUrl || error || !touched} disabled={!screenUrl || error || !touched}
> >
<form on:submit|preventDefault={() => modal.confirm()}>
<Input <Input
label="Enter a URL for the new screen" label="Enter a URL for the new screen"
{error} {error}
@ -67,6 +70,7 @@
<div class="app-server" title={appUrl}> <div class="app-server" title={appUrl}>
{appUrl} {appUrl}
</div> </div>
</form>
</ModalContent> </ModalContent>
<style> <style>