diff --git a/src/base/projects/BranchSelector.svelte b/src/base/projects/BranchSelector.svelte index 0157af0cc..eed97e4c3 100644 --- a/src/base/projects/BranchSelector.svelte +++ b/src/base/projects/BranchSelector.svelte @@ -14,6 +14,7 @@ const switchBranch = (name: string) => { dispatch("branchChanged", name); }; + let branchLabel: string | null = null; $: branchList = Object.keys(branches).sort(); @@ -22,8 +23,10 @@ $: commit = getOid(revision, branches) || head; $: if (commit == head) { branchLabel = project.defaultBranch; - } else if (! isOid(revision)) { + } else if (branches[revision]) { branchLabel = revision; + } else { + branchLabel = null; } diff --git a/src/base/projects/Header.svelte b/src/base/projects/Header.svelte index eedd30b27..ba7df9b32 100644 --- a/src/base/projects/Header.svelte +++ b/src/base/projects/Header.svelte @@ -24,6 +24,8 @@ $: if (Object.keys(browser.branches).length > 0) { branches = browser.branches; + } else { + proj.browse({ branches }); } let dropdownState: { [key: string]: boolean } = { clone: false, seed: false, branch: false, peer: false }; diff --git a/src/base/projects/History.svelte b/src/base/projects/History.svelte index 257a89a77..1cb462e88 100644 --- a/src/base/projects/History.svelte +++ b/src/base/projects/History.svelte @@ -11,7 +11,7 @@ let { urn, seed } = source; const navigateHistory = (revision: string, content?: ProjectContent) => { - proj.navigateTo({ content, revision }, source); + proj.navigateTo({ content, revision, path: null }, source); }; const fetchCommits = async (parentCommit: string): Promise => { const commitsQuery = await getCommits(urn, parentCommit, seed.api); diff --git a/src/base/projects/Project.svelte b/src/base/projects/Project.svelte index 4290a4d12..7e7916b78 100644 --- a/src/base/projects/Project.svelte +++ b/src/base/projects/Project.svelte @@ -43,6 +43,11 @@ { prop: "og:description", content: project.description }, { prop: "og:url", content: window.location.href } ]); + + // Necessary for the initial load, but causes double rendering. + // Once the content routing is above this component, this can go + // away. + $: revision = $browserStore.revision;