Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
syuilo 2022-01-26 18:42:16 +09:00
commit ea8a94e6e2

View file

@ -1,8 +1,8 @@
import * as config from '@/config'; import * as config from '@/config';
export function popout(path: string, w?: HTMLElement) { export function popout(path: string, w?: HTMLElement) {
let url = path.startsWith('http://') || path.startsWith('https://') ? path : config.url + path; let url = path.startsWith('http://') || path.startsWith('https://') ? path : config.url + "/" + path;
url += '?zen'; // TODO: ちゃんとURLパースしてクエリ付ける url += '?zen';
if (w) { if (w) {
const position = w.getBoundingClientRect(); const position = w.getBoundingClientRect();
const width = parseInt(getComputedStyle(w, '').width, 10); const width = parseInt(getComputedStyle(w, '').width, 10);