summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-01-26 18:42:16 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-01-26 18:42:16 +0900
commitea8a94e6e2f7ad558544ef08970f7f8eff8adc22 (patch)
tree701f8e096886c3f935e979fe05a6c1dde198b8a1
parentrefactor: fix type (diff)
parentFix pop-out bug (#8170) (diff)
downloadsharkey-ea8a94e6e2f7ad558544ef08970f7f8eff8adc22.tar.gz
sharkey-ea8a94e6e2f7ad558544ef08970f7f8eff8adc22.tar.bz2
sharkey-ea8a94e6e2f7ad558544ef08970f7f8eff8adc22.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
-rw-r--r--packages/client/src/scripts/popout.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/client/src/scripts/popout.ts b/packages/client/src/scripts/popout.ts
index 51b8d72868..b8286a2a76 100644
--- a/packages/client/src/scripts/popout.ts
+++ b/packages/client/src/scripts/popout.ts
@@ -1,8 +1,8 @@
import * as config from '@/config';
export function popout(path: string, w?: HTMLElement) {
- let url = path.startsWith('http://') || path.startsWith('https://') ? path : config.url + path;
- url += '?zen'; // TODO: ちゃんとURLパースしてクエリ付ける
+ let url = path.startsWith('http://') || path.startsWith('https://') ? path : config.url + "/" + path;
+ url += '?zen';
if (w) {
const position = w.getBoundingClientRect();
const width = parseInt(getComputedStyle(w, '').width, 10);