Michel2/pybricks-code
1
0
Fork 0
mirror of https://github.com/pybricks/pybricks-code.git synced 2026-09-12 09:36:27 +00:00
Code Issues Releases Activity

convert macOS check to utility function

Browse Source
This commit is contained in:
David Lechner
2021-01-14 15:25:57 -06:00
parent a48f3f381e
commit 25c0d104a9
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Editor.tsx
+3 -2
View File
@@ -17,6 +17,7 @@ import { connect } from 'react-redux';
import { Action, Dispatch } from '../actions';
import { setEditSession, storageChanged } from '../actions/editor';
import { RootState } from '../reducers';
import { isMacOS } from '../utils/os';
import { EditorStringId } from './editor-i18n';
import en from './editor-i18n.en.json';
@@ -142,7 +143,7 @@ class Editor extends React.Component<EditorProps> {
}}
text={i18n.translate(EditorStringId.Copy)}
icon="duplicate"
label={/mac/i.test(navigator.platform) ? 'Cmd-C' : 'Ctrl-C'}
label={isMacOS() ? 'Cmd-C' : 'Ctrl-C'}
disabled={this.editor?.getSelection().isEmpty()}
/>
<MenuItem
@@ -154,7 +155,7 @@ class Editor extends React.Component<EditorProps> {
}}
text={i18n.translate(EditorStringId.Paste)}
icon="clipboard"
label={/mac/i.test(navigator.platform) ? 'Cmd-V' : 'Ctrl-V'}
label={isMacOS() ? 'Cmd-V' : 'Ctrl-V'}
/>
<MenuDivider />
<MenuItem
src/components/Terminal.tsx
+3 -2
View File
@@ -17,6 +17,7 @@ import { FitAddon } from 'xterm-addon-fit';
import { Dispatch } from '../actions';
import { receiveData } from '../actions/terminal';
import { RootState } from '../reducers';
import { isMacOS } from '../utils/os';
import { TerminalStringId } from './terminal-i18n';
import en from './terminal-i18n.en.json';
@@ -137,7 +138,7 @@ class Terminal extends React.Component<TerminalProps> {
}}
text={i18n.translate(TerminalStringId.Copy)}
icon="duplicate"
label={/mac/i.test(navigator.platform) ? 'Cmd-C' : 'Ctrl-Shift-C'}
label={isMacOS() ? 'Cmd-C' : 'Ctrl-Shift-C'}
disabled={!this.xterm.hasSelection()}
/>
<MenuItem
@@ -146,7 +147,7 @@ class Terminal extends React.Component<TerminalProps> {
}}
text={i18n.translate(TerminalStringId.Paste)}
icon="clipboard"
label={/mac/i.test(navigator.platform) ? 'Cmd-V' : 'Ctrl-V'}
label={isMacOS() ? 'Cmd-V' : 'Ctrl-V'}
/>
<MenuDivider />
<MenuItem