github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 22:08:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15266 from atom/ns-fix-alt-bindings-on-mac

Browse Source 
Suppress composition events default prevented on previous keydown
This commit is contained in:
Nathan Sobo
2017-08-12 15:23:33 -06:00
committed by GitHub
parent acc7b97ae0 744b96df46
commit 592d174e3b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/text-editor-component.js
View File

@@ -1570,6 +1570,10 @@ class TextEditorComponent {
}
didTextInput (event) {
// Workaround for Chromium not preventing composition events when
// preventDefault is called on the keydown event that precipitated them.
if (this.lastKeydown && this.lastKeydown.defaultPrevented) return
if (!this.isInputEnabled()) return
event.stopPropagation()
@@ -1626,7 +1630,6 @@ class TextEditorComponent {
didKeypress (event) {
this.lastKeydownBeforeKeypress = this.lastKeydown
this.lastKeydown = null
// This cancels the accented character behavior if we type a key normally
// with the menu open.
@@ -1636,7 +1639,6 @@ class TextEditorComponent {
didKeyup (event) {
if (this.lastKeydownBeforeKeypress && this.lastKeydownBeforeKeypress.code === event.code) {
this.lastKeydownBeforeKeypress = null
this.lastKeydown = null
}
}
@@ -1662,6 +1664,10 @@ class TextEditorComponent {
}
didCompositionUpdate (event) {
// Workaround for Chromium not preventing composition events when
// preventDefault is called on the keydown event that precipitated them.
if (this.lastKeydown && this.lastKeydown.defaultPrevented) return
if (this.getChromeVersion() === 56) {
process.nextTick(() => {
if (this.compositionCheckpoint) {