diff --git a/src/base/projects/Browser.svelte b/src/base/projects/Browser.svelte index e1a429b7a..6f6772a81 100644 --- a/src/base/projects/Browser.svelte +++ b/src/base/projects/Browser.svelte @@ -21,14 +21,21 @@ | { status: Status.Loaded; path: string; blob: proj.Blob }; export let urn: string; - export let revision: string; export let config: Config; - export let path: string; export let org: string | null = null; export let user: string | null = null; export let tree: proj.Tree; export let project: proj.Info; export let branches: [string, string][]; + export let locator: string; // eg. "master/README.md" + export let content: proj.ProjectContent; + + // Bind content to file tree to trigger updates in parent components. + content = proj.ProjectContent.Tree; + + // This is reactive to respond to path changes that don't originate from this + // component, eg. when using the browser's "back" button. + $: [revision, path] = proj.splitPrefixFromPath(locator, branches, project.head); // When the component is loaded the first time, the blob is yet to be loaded. let state: State = { status: Status.Loading, path }; @@ -90,9 +97,6 @@ mobileFileTree = !mobileFileTree; }; - // This is reactive to respond to path changes that don't originate from this - // component, eg. when using the browser's "back" button. - $: [revision, path] = proj.splitPrefixFromPath(revision, branches, project.head); $: commit = proj.getOid(project.head, revision, branches); $: dispatch("routeParamsChange", { content: proj.ProjectContent.Tree, revision, path }); $: getBlob = loadBlob(path); diff --git a/src/base/projects/Commit/History.svelte b/src/base/projects/Commit/History.svelte index 85112d163..81d51e642 100644 --- a/src/base/projects/Commit/History.svelte +++ b/src/base/projects/Commit/History.svelte @@ -1,26 +1,35 @@ -{#await fetchCommits()} +{#await fetchCommits(revision)} {:then history}
diff --git a/src/base/projects/Header.svelte b/src/base/projects/Header.svelte index c9ba5da65..32727c0c9 100644 --- a/src/base/projects/Header.svelte +++ b/src/base/projects/Header.svelte @@ -206,50 +206,48 @@
- {#if revision} - updateRevision(event.detail)} /> -
- {#if anchors} - {#await getAnchor} - - {:then anchor} - {#if anchor} - - {#if commit == anchor[0] && commit === project.head} - - latest 🔐 - - - {:else if commit == anchor[0] && commit !== project.head} - updateRevision(project.head)}> - latest 🔐 - - - {:else if anchor?.includes(commit)} - updateRevision(anchor[0])}> - stale 🔒 - - - {:else} - updateRevision(anchor[0])}> - not anchored 🔓 - - {/if} + updateRevision(event.detail)} /> +
+ {#if anchors} + {#await getAnchor} + + {:then anchor} + {#if anchor} + + {#if commit == anchor[0] && commit === project.head} + + latest 🔐 + + + {:else if commit == anchor[0] && commit !== project.head} + updateRevision(project.head)}> + latest 🔐 + + + {:else if anchor?.includes(commit)} + updateRevision(anchor[0])}> + stale 🔒 + + {:else} - - + updateRevision(anchor[0])}> not anchored 🔓 {/if} - {:catch} - - ❌ + {:else} + + + not anchored 🔓 - {/await} - {/if} -
- {/if} + {/if} + {:catch} + + ❌ + + {/await} + {/if} +
{#if config.seed.git.host}
(cloneDropdown = !cloneDropdown)}> diff --git a/src/base/projects/ProjectContentRoutes.svelte b/src/base/projects/ProjectContentRoutes.svelte index b17e7f1fe..79eaad9bf 100644 --- a/src/base/projects/ProjectContentRoutes.svelte +++ b/src/base/projects/ProjectContentRoutes.svelte @@ -1,7 +1,6 @@ + locator={project.head} + bind:content={content} + on:routeParamsChange /> + locator={project.head} + bind:content={content} + on:routeParamsChange /> - + - + - + diff --git a/src/base/projects/View.svelte b/src/base/projects/View.svelte index a087de25b..9e44db6f5 100644 --- a/src/base/projects/View.svelte +++ b/src/base/projects/View.svelte @@ -169,10 +169,11 @@ branches={result.branches} profile={result.profile} on:routeParamsChange={updateRouteParams} /> - {:catch err}