diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2024-07-30 14:45:53 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-30 14:45:53 +0900 |
| commit | 866abff54d8e3c377361a0d75ef7ee59ba2fcd84 (patch) | |
| tree | d0c259a75e9e11e9a62b2f61477bd106002c7863 /packages/frontend/src/os.ts | |
| parent | enhance(frontend): ドライブのファイル・フォルダをドラッグ... (diff) | |
| download | misskey-866abff54d8e3c377361a0d75ef7ee59ba2fcd84.tar.gz misskey-866abff54d8e3c377361a0d75ef7ee59ba2fcd84.tar.bz2 misskey-866abff54d8e3c377361a0d75ef7ee59ba2fcd84.zip | |
enhance(frontend): ブラウザのコンテキストメニューを使用できるように (#14076)
* enhance(frontend): ブラウザのコンテキストメニューを使用できるように
* Update Changelog
* shiftにした
* change keys
* fix
* fix
* fix
* update translation keys
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Diffstat (limited to 'packages/frontend/src/os.ts')
| -rw-r--r-- | packages/frontend/src/os.ts | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts index a8dd99c854..f42e2ed3c5 100644 --- a/packages/frontend/src/os.ts +++ b/packages/frontend/src/os.ts @@ -11,6 +11,7 @@ import * as Misskey from 'misskey-js'; import type { ComponentProps as CP } from 'vue-component-type-helpers'; import type { Form, GetFormResultType } from '@/scripts/form.js'; import { misskeyApi } from '@/scripts/misskey-api.js'; +import { defaultStore } from '@/store.js'; import { i18n } from '@/i18n.js'; import MkPostFormDialog from '@/components/MkPostFormDialog.vue'; import MkWaitingDialog from '@/components/MkWaitingDialog.vue'; @@ -654,6 +655,13 @@ export function popupMenu(items: MenuItem[], src?: HTMLElement | EventTarget | n } export function contextMenu(items: MenuItem[], ev: MouseEvent): Promise<void> { + if ( + defaultStore.state.contextMenu === 'native' || + (defaultStore.state.contextMenu === 'appWithShift' && !ev.shiftKey) + ) { + return Promise.resolve(); + } + let returnFocusTo = getHTMLElementOrNull(ev.currentTarget ?? ev.target) ?? getHTMLElementOrNull(document.activeElement); ev.preventDefault(); return new Promise(resolve => nextTick(() => { |