mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-18 06:22:28 +03:00
what in gods name
This commit is contained in:
parent
5603dbba5f
commit
2ef63bc1d9
@ -23,9 +23,11 @@
|
||||
const activeBranchesError = vbranchService.activeBranchesError;
|
||||
const activeBranches = vbranchService.activeBranches;
|
||||
|
||||
let selectedBranch: {
|
||||
let selectedBranch:
|
||||
| {
|
||||
name: string;
|
||||
} | undefined;
|
||||
}
|
||||
| undefined;
|
||||
|
||||
let dragged: any;
|
||||
let dropZone: HTMLDivElement;
|
||||
@ -46,7 +48,8 @@
|
||||
if (!selectedBranch) return;
|
||||
// while target is setting, display loading
|
||||
isSwitching = true;
|
||||
await branchController.setTarget(selectedBranch.name)
|
||||
await branchController
|
||||
.setTarget(selectedBranch.name)
|
||||
.then((res) => {
|
||||
console.log('done', res);
|
||||
})
|
||||
@ -65,9 +68,7 @@
|
||||
{:else if !$activeBranches}
|
||||
<FullviewLoading />
|
||||
{:else if isSwitching}
|
||||
<div class="middle-message">
|
||||
switching base branch...
|
||||
</div>
|
||||
<div class="middle-message">switching base branch...</div>
|
||||
{:else}
|
||||
<div
|
||||
class="board"
|
||||
@ -167,7 +168,14 @@
|
||||
No remote branches
|
||||
{:else}
|
||||
<div class="spacer">
|
||||
<Select items={remoteBranches.filter(item => item.name != $baseBranch.branchName)} bind:value={selectedBranch} itemId="name" labelId="name">
|
||||
<Select
|
||||
items={remoteBranches.filter(
|
||||
(item) => item.name != $baseBranch.branchName
|
||||
)}
|
||||
bind:value={selectedBranch}
|
||||
itemId="name"
|
||||
labelId="name"
|
||||
>
|
||||
<SelectItem slot="template" let:item let:selected {selected}>
|
||||
{item.name}
|
||||
</SelectItem>
|
||||
|
Loading…
Reference in New Issue
Block a user