Skip to content

Fix #3190 - App blanks out after setting HotKey #3193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rokt33r merged 4 commits into from
Sep 2, 2019
Merged

Fix #3190 - App blanks out after setting HotKey #3193

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f349844
fix lack of hotkey properties
amedora Aug 1, 2019
c17d722
Merge branch 'master' into fix-3190-setting-hotkey
amedora Sep 2, 2019
169b697
Merge branch 'master' into fix-3190-setting-hotkey
Rokt33r Sep 2, 2019
e508000
Update HotkeyTab.js
Rokt33r Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion browser/main/modals/PreferencesModal/HotkeyTab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ class HotkeyTab extends React.Component {
toggleMode: this.refs.toggleMode.value,
deleteNote: this.refs.deleteNote.value,
pasteSmartly: this.refs.pasteSmartly.value,
toggleMenuBar: this.refs.toggleMenuBar.value
toggleMenuBar: this.refs.toggleMenuBar.value,
insertDate: this.refs.insertDate.value,
insertDateTime: this.refs.insertDateTime.value
}
this.setState({
config
Expand Down Expand Up @@ -177,6 +179,7 @@ class HotkeyTab extends React.Component {
<div styleName='group-section-label'>{i18n.__('Insert Current Date')}</div>
<div styleName='group-section-control'>
<input styleName='group-section-control-input'
ref='insertDate'
value={config.hotkey.insertDate}
type='text'
disabled='true'
Expand All @@ -187,6 +190,7 @@ class HotkeyTab extends React.Component {
<div styleName='group-section-label'>{i18n.__('Insert Current Date and Time')}</div>
<div styleName='group-section-control'>
<input styleName='group-section-control-input'
ref='insertDateTime'
value={config.hotkey.insertDateTime}
type='text'
disabled='true'
Expand Down