public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2026-01-30 17:17:17 +00:00
Code Issues Releases Wiki Activity

Windowsに合わせてUI修正（Font/Username/Key input:Command key -> Control key)

Browse Source
This commit is contained in:
Dick Choi
2015-11-17 09:01:25 +09:00
parent 76a031a8c9
commit 1318abd37e
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
browser/main/HomePage.js
View File

@@ -43,7 +43,7 @@ class HomePage extends React.Component {
}
// Search inputがfocusされていたら大体のキー入力は無視される。
if (top.isInputFocused() && !e.metaKey) {
if (top.isInputFocused() && !(e.metaKey || e.ctrlKey)) {
if (e.keyCode === 13 || e.keyCode === 27) top.escape()
return
}
@@ -54,7 +54,7 @@ class HomePage extends React.Component {
if (e.keyCode === 27) {
detail.handleCancelButtonClick()
}
if ((e.keyCode === 13 && e.metaKey) || (e.keyCode === 83 && e.metaKey)) {
if ((e.keyCode === 13 && (e.metaKey || e.ctrlKey)) || (e.keyCode === 83 && (e.metaKey || e.ctrlKey))) {
detail.handleSaveButtonClick()
}
break
@@ -72,14 +72,14 @@ class HomePage extends React.Component {
if (e.keyCode === 27) {
detail.handleDeleteCancelButtonClick()
}
if (e.keyCode === 13 && e.metaKey) {
if (e.keyCode === 13 && (e.metaKey || e.ctrlKey)) {
detail.handleDeleteConfirmButtonClick()
}
break
}
// `detail`の`openDeleteConfirmMenu`が`true`なら呼ばれない。
if (e.keyCode === 27 || (e.keyCode === 70 && e.metaKey)) {
if (e.keyCode === 27 || (e.keyCode === 70 && (e.metaKey || e.ctrlKey))) {
top.focusInput()
}
@@ -91,7 +91,7 @@ class HomePage extends React.Component {
list.selectNextArticle()
}
if (e.keyCode === 65 || e.keyCode === 13 && e.metaKey) {
if (e.keyCode === 65 || e.keyCode === 13 && (e.metaKey || e.ctrlKey)) {
nav.handleNewPostButtonClick()
e.preventDefault()
}

5
browser/main/HomePage/ArticleNavigator.js
View File

@@ -7,7 +7,10 @@ import Preferences from 'boost/components/modal/Preferences'
import CreateNewFolder from 'boost/components/modal/CreateNewFolder'
import remote from 'remote'
let userName = remote.getGlobal('process').env.USER
let mainEnv = remote.getGlobal('process').env
let userName = mainEnv.USER != null
? mainEnv.USER
: mainEnv.USERNAME
const BRAND_COLOR = '#18AF90'