mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
OSX -> macOS
This commit is contained in:
@@ -176,7 +176,7 @@ class MenuManager
|
||||
unmerge: (menu, item) ->
|
||||
MenuHelpers.unmerge(menu, item)
|
||||
|
||||
# OSX can't handle displaying accelerators for multiple keystrokes.
|
||||
# macOS can't handle displaying accelerators for multiple keystrokes.
|
||||
# If they are sent across, it will stop processing accelerators for the rest
|
||||
# of the menu items.
|
||||
filterMultipleKeystroke: (keystrokesByCommand) ->
|
||||
|
||||
@@ -371,7 +371,7 @@ class TextEditorComponent
|
||||
|
||||
# Workaround of the accented character suggestion feature in macOS.
|
||||
# This will only occur when the user is not composing in IME mode.
|
||||
# When the user selects a modified character from the OSX menu, `textInput`
|
||||
# When the user selects a modified character from the macOS menu, `textInput`
|
||||
# will occur twice, once for the initial character, and once for the
|
||||
# modified character. However, only a single keypress will have fired. If
|
||||
# this is the case, select backward to replace the original character.
|
||||
@@ -551,7 +551,7 @@ class TextEditorComponent
|
||||
|
||||
{detail, shiftKey, metaKey, ctrlKey} = event
|
||||
|
||||
# CTRL+click brings up the context menu on OSX, so don't handle those either
|
||||
# CTRL+click brings up the context menu on macOS, so don't handle those either
|
||||
return if ctrlKey and process.platform is 'darwin'
|
||||
|
||||
# Prevent focusout event on hidden input if editor is already focused
|
||||
|
||||
@@ -46,7 +46,7 @@ class WorkspaceElement extends HTMLElement
|
||||
|
||||
updateGlobalTextEditorStyleSheet: ->
|
||||
fontFamily = @config.get('editor.fontFamily')
|
||||
# TODO: There is a bug in how some emojis (e.g. ❤️) are rendered on OSX.
|
||||
# TODO: There is a bug in how some emojis (e.g. ❤️) are rendered on macOS.
|
||||
# This workaround should be removed once we update to Chromium 51, where the
|
||||
# problem was fixed.
|
||||
fontFamily += ', "Apple Color Emoji"' if process.platform is 'darwin'
|
||||
|
||||
Reference in New Issue
Block a user