mirror of
https://github.com/BoostIo/Boostnote
synced 2025-12-13 17:56:25 +00:00
handle ctrl key as meta key when using Windows
This commit is contained in:
@@ -29,6 +29,8 @@ class HomePage extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleKeyDown (e) {
|
handleKeyDown (e) {
|
||||||
|
let cmdOrCtrl = process.platform === 'darwin' ? e.metaKey : e.ctrlKey
|
||||||
|
|
||||||
if (isModalOpen()) {
|
if (isModalOpen()) {
|
||||||
if (e.keyCode === 27) closeModal()
|
if (e.keyCode === 27) closeModal()
|
||||||
return
|
return
|
||||||
@@ -55,13 +57,13 @@ class HomePage extends React.Component {
|
|||||||
if (e.keyCode === 27) {
|
if (e.keyCode === 27) {
|
||||||
detail.handleCancelButtonClick()
|
detail.handleCancelButtonClick()
|
||||||
}
|
}
|
||||||
if ((e.keyCode === 13 && (e.metaKey || e.ctrlKey)) || (e.keyCode === 83 && (e.metaKey || e.ctrlKey))) {
|
if ((e.keyCode === 13 && (cmdOrCtrl)) || (e.keyCode === 83 && (cmdOrCtrl))) {
|
||||||
detail.handleSaveButtonClick()
|
detail.handleSaveButtonClick()
|
||||||
}
|
}
|
||||||
if (e.keyCode === 80 && e.metaKey) {
|
if (e.keyCode === 80 && cmdOrCtrl) {
|
||||||
detail.handleTogglePreviewButtonClick()
|
detail.handleTogglePreviewButtonClick()
|
||||||
}
|
}
|
||||||
if (e.keyCode === 78 && e.metaKey) {
|
if (e.keyCode === 78 && cmdOrCtrl) {
|
||||||
nav.handleNewPostButtonClick()
|
nav.handleNewPostButtonClick()
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
}
|
}
|
||||||
@@ -80,14 +82,14 @@ class HomePage extends React.Component {
|
|||||||
if (e.keyCode === 27) {
|
if (e.keyCode === 27) {
|
||||||
detail.handleDeleteCancelButtonClick()
|
detail.handleDeleteCancelButtonClick()
|
||||||
}
|
}
|
||||||
if (e.keyCode === 13 && (e.metaKey || e.ctrlKey)) {
|
if (e.keyCode === 13 && cmdOrCtrl) {
|
||||||
detail.handleDeleteConfirmButtonClick()
|
detail.handleDeleteConfirmButtonClick()
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
// `detail`の`openDeleteConfirmMenu`が`true`なら呼ばれない。
|
// `detail`の`openDeleteConfirmMenu`が`true`なら呼ばれない。
|
||||||
if (e.keyCode === 27 || (e.keyCode === 70 && (e.metaKey || e.ctrlKey))) {
|
if (e.keyCode === 27 || (e.keyCode === 70 && cmdOrCtrl)) {
|
||||||
top.focusInput()
|
top.focusInput()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -99,7 +101,7 @@ class HomePage extends React.Component {
|
|||||||
list.selectNextArticle()
|
list.selectNextArticle()
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((e.keyCode === 65 && !e.metaKey && !e.ctrlKey) || (e.keyCode === 13 && e.metaKey) || (e.keyCode === 78 && e.metaKey)) {
|
if ((e.keyCode === 65 && !e.metaKey && !e.ctrlKey) || (e.keyCode === 13 && cmdOrCtrl) || (e.keyCode === 78 && cmdOrCtrl)) {
|
||||||
nav.handleNewPostButtonClick()
|
nav.handleNewPostButtonClick()
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user