diff --git a/src/components/Comment.svelte b/src/components/Comment.svelte index a1c6dc40d..9c4ed5684 100644 --- a/src/components/Comment.svelte +++ b/src/components/Comment.svelte @@ -143,6 +143,7 @@ {#if editComment && state !== "read"} {@const editComment_ = editComment} {#if preview}
- +
{:else} { await navigator.clipboard.writeText(text); } -export function getRawBasePath( - id: string, - baseUrl: BaseUrl, - commit: string, -): string { - return `${baseUrl.scheme}://${baseUrl.hostname}:${baseUrl.port}/raw/${id}/${commit}`; -} - export function formatLocationHash(hash: string | null): number | null { if (hash && hash.match(/^#L[0-9]+$/)) return parseInt(hash.slice(2)); return null; diff --git a/src/views/projects/Cob/Revision.svelte b/src/views/projects/Cob/Revision.svelte index 208da763f..28fbee847 100644 --- a/src/views/projects/Cob/Revision.svelte +++ b/src/views/projects/Cob/Revision.svelte @@ -30,6 +30,7 @@ export let baseUrl: BaseUrl; export let expanded: boolean = false; + export let rawPath: (commit?: string) => string; export let patchId: string; export let patchState: PatchState; export let projectHead: string; @@ -391,7 +392,7 @@ {#if revisionDescription && !first}
{/if} @@ -430,8 +431,8 @@
{#if review.verdict === "accept"} diff --git a/src/views/projects/Issue.svelte b/src/views/projects/Issue.svelte index 5951a1c8d..6417d0431 100644 --- a/src/views/projects/Issue.svelte +++ b/src/views/projects/Issue.svelte @@ -38,9 +38,9 @@ export let baseUrl: BaseUrl; export let issue: Issue; export let project: Project; + export let rawPath: (commit?: string) => string; export let tracking: boolean; - const rawPath = utils.getRawBasePath(project.id, baseUrl, project.head); const api = new HttpdClient(baseUrl); const items: [string, IssueState][] = [ @@ -514,6 +514,7 @@
{#if issueState !== "read"} + rawPath={rawPath(project.head)} />
{/if}
@@ -585,7 +582,7 @@ diff --git a/src/views/projects/Issue/New.svelte b/src/views/projects/Issue/New.svelte index 95b7f0269..1f5017943 100644 --- a/src/views/projects/Issue/New.svelte +++ b/src/views/projects/Issue/New.svelte @@ -25,6 +25,7 @@ export let baseUrl: BaseUrl; export let project: Project; + export let rawPath: (commit?: string) => string; export let tracking: boolean; let newEmbeds: EmbedWithOid[] = []; @@ -191,7 +192,10 @@ {:else if !issueText}

No description

{:else} - + {/if}
diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte index 621045e6e..0ed65b5a2 100644 --- a/src/views/projects/Patch.svelte +++ b/src/views/projects/Patch.svelte @@ -77,6 +77,7 @@ export let baseUrl: BaseUrl; export let patch: Patch; + export let rawPath: (commit?: string) => string; export let project: Project; export let view: PatchView; export let tracking: boolean; @@ -678,6 +679,7 @@
{#if session && patchState !== "read"} + rawPath={rawPath(patch.revisions[0].id)} /> {:else} No description available {/if} @@ -841,6 +839,7 @@ index > 0 ? patch.revisions[index - 1] : undefined} string; export let blobResult: BlobResult; export let branches: string[]; export let path: string; @@ -208,11 +208,7 @@ {path} blob={blobResult.blob} highlighted={blobResult.highlighted} - rawPath={utils.getRawBasePath( - project.id, - baseUrl, - tree.lastCommit.id, - )} /> + rawPath={rawPath(tree.lastCommit.id)} /> {:else} string; blobResult: BlobResult; tracking: boolean; }; @@ -146,6 +147,7 @@ export type ProjectLoadedRoute = params: { baseUrl: BaseUrl; project: Project; + rawPath: (commit?: string) => string; issue: Issue; tracking: boolean; }; @@ -165,6 +167,7 @@ export type ProjectLoadedRoute = params: { baseUrl: BaseUrl; project: Project; + rawPath: (commit?: string) => string; tracking: boolean; }; } @@ -183,6 +186,7 @@ export type ProjectLoadedRoute = params: { baseUrl: BaseUrl; project: Project; + rawPath: (commit?: string) => string; patch: Patch; view: PatchView; tracking: boolean; @@ -263,6 +267,10 @@ export async function loadProjectRoute( route: ProjectRoute, ): Promise { const api = new HttpdClient(route.node); + const rawPath = (commit?: string) => + `${route.node.scheme}://${route.node.hostname}:${route.node.port}/raw/${ + route.project + }${commit ? `/${commit}` : ""}`; try { if (route.resource === "project.source") { @@ -296,6 +304,7 @@ export async function loadProjectRoute( params: { baseUrl: route.node, project, + rawPath, issue, tracking, }, @@ -314,6 +323,7 @@ export async function loadProjectRoute( params: { baseUrl: route.node, project, + rawPath, tracking, }, }; @@ -416,6 +426,10 @@ async function loadTreeView( route: ProjectTreeRoute, ): Promise { const api = new HttpdClient(route.node); + const rawPath = (commit?: string) => + `${route.node.scheme}://${route.node.hostname}:${route.node.port}/raw/${ + route.project + }${commit ? `/${commit}` : ""}`; const [project, peers, branchMap, tracking] = await Promise.all([ api.project.getById(route.project), @@ -453,6 +467,7 @@ async function loadTreeView( peers, peer: route.peer, branches: Object.keys(branchMap || {}), + rawPath, revision: route.revision, tree, path, @@ -559,6 +574,10 @@ async function loadPatchView( route: ProjectPatchRoute, ): Promise { const api = new HttpdClient(route.node); + const rawPath = (commit?: string) => + `${route.node.scheme}://${route.node.hostname}:${route.node.port}/raw/${ + route.project + }${commit ? `/${commit}` : ""}`; const [project, patch, tracking] = await Promise.all([ api.project.getById(route.project), api.project.getPatchById(route.project, route.patch), @@ -615,6 +634,7 @@ async function loadPatchView( params: { baseUrl: route.node, project, + rawPath, patch, view, tracking,