diff --git a/src/lib/ui/post/Post.svelte b/src/lib/ui/post/Post.svelte index 15f01aa..b4e9dbe 100644 --- a/src/lib/ui/post/Post.svelte +++ b/src/lib/ui/post/Post.svelte @@ -32,15 +32,9 @@ let mouse_pos = { top: 0, left: 0 }; - function gotoPost(event) { + function gotoPost() { if (focused) return; - if (event) { - if (event.type == "mouseup" && ( - event.button !== 0 || - event.shiftKey || - event.ctrlKey)) return; - if (event.key && event.key !== "Enter") return; - } + if (event && event.key && event.key !== "Enter") return; goto(`/post/${post.id}`); } @@ -68,7 +62,7 @@ aria-label={aria_label} bind:this={el} on:mousedown={e => {mouse_pos.left = e.pageX; mouse_pos.top = e.pageY}} - on:mouseup={e => {if (e.pageX == mouse_pos.left && e.pageY == mouse_pos.top) gotoPost(e)}} + on:mouseup={e => {if (e.pageX == mouse_pos.left && e.pageY == mouse_pos.top) gotoPost()}} on:keydown={gotoPost}> diff --git a/src/lib/ui/post/ReplyContext.svelte b/src/lib/ui/post/ReplyContext.svelte index 20d7ab4..ee67857 100644 --- a/src/lib/ui/post/ReplyContext.svelte +++ b/src/lib/ui/post/ReplyContext.svelte @@ -16,15 +16,8 @@ let mouse_pos = { top: 0, left: 0 }; - function gotoPost(event) { - if (event) { - - if (event.type == "mouseup" && ( - event.button !== 0 || - event.shiftKey || - event.ctrlKey)) return; - if (event.key && event.key !== "Enter") return; - } + function gotoPost() { + if (event && event.key && event.key !== "Enter") return; goto(`/post/${post.id}`); } @@ -39,7 +32,7 @@ class="post-reply" aria-label={aria_label} on:mousedown={e => {mouse_pos.left = e.pageX; mouse_pos.top = e.pageY}} - on:mouseup={e => {if (e.pageX == mouse_pos.left && e.pageY == mouse_pos.top) gotoPost(e)}} + on:mouseup={e => {if (e.pageX == mouse_pos.left && e.pageY == mouse_pos.top) gotoPost()}} on:keydown={gotoPost}>
diff --git a/src/routes/post/[id]/+page.svelte b/src/routes/post/[id]/+page.svelte index e3df0dc..72d218e 100644 --- a/src/routes/post/[id]/+page.svelte +++ b/src/routes/post/[id]/+page.svelte @@ -42,6 +42,7 @@ ); } + console.log(post); return post; })();