diff --git a/src/components/DropdownList.svelte b/src/components/DropdownList.svelte index c18ed2ae9..de385bbbc 100644 --- a/src/components/DropdownList.svelte +++ b/src/components/DropdownList.svelte @@ -26,5 +26,9 @@ + {:else} + {/each} diff --git a/src/views/projects/Source/BranchSelector.svelte b/src/views/projects/Source/BranchSelector.svelte index a7e3186d4..8ec5797fc 100644 --- a/src/views/projects/Source/BranchSelector.svelte +++ b/src/views/projects/Source/BranchSelector.svelte @@ -3,6 +3,7 @@ import type { Route } from "@app/lib/router"; import * as utils from "@app/lib/utils"; + import { activeUnloadedRouteStore } from "@app/lib/router"; import { closeFocused } from "@app/components/Popover.svelte"; import DropdownList from "@app/components/DropdownList.svelte"; @@ -11,7 +12,6 @@ import IconSmall from "@app/components/IconSmall.svelte"; import Link from "@app/components/Link.svelte"; import Button from "@app/components/Button.svelte"; - import HoverPopover from "@app/components/HoverPopover.svelte"; export let branches: Array<{ name: string; route: Route }>; export let node: BaseUrl; @@ -19,7 +19,6 @@ export let selectedBranch: string | undefined; export let selectedCommitId: string; - $: onCanonicalBranch = branches.length === 0; $: selectedCommitShortId = utils.formatCommit(selectedCommitId); @@ -39,62 +38,45 @@
{#if selectedBranch} - {#if onCanonicalBranch} - - -
-
- You are currently browsing the canonical branch. -
- If you want to browse a specific branch, you need to select the desired - remote first. -
-
- {:else} - - + + - - - closeFocused()}> - -
{item.name}
-
- -
-
-
- {/if} + + + closeFocused()}> + +
{item.name}
+
+ +
+ + closeFocused()}> + +
{project.defaultBranch}
+
+ +
+
+
{/if}