Unify wording and spelling in config and other places (#2422)

This commit is contained in:
Benjamin Staneck 2017-11-04 23:19:02 +01:00 committed by CHaBou
parent be4b2c8870
commit 8fc75b15ff
7 changed files with 29 additions and 29 deletions

View file

@ -18,7 +18,7 @@
- **OS version and name**: <!-- Replace with version + name --> - **OS version and name**: <!-- Replace with version + name -->
- **Hyper.app version**: <!-- Replace with version --> - **Hyper.app version**: <!-- Replace with version -->
- **Link of a [Gist](https://gist.github.com/) with the contents of your .hyper.js**: <!-- Gist Link Here --> - **Link of a [Gist](https://gist.github.com/) with the contents of your .hyper.js**: <!-- Gist Link Here -->
- **Relevant information from devtools** _(CMD+ALT+I on Mac OS, CTRL+SHIFT+I elsewhere)_: <!-- Replace with info if applicable, or N/A --> - **Relevant information from devtools** _(CMD+ALT+I on macOS, CTRL+SHIFT+I elsewhere)_: <!-- Replace with info if applicable, or N/A -->
- **The issue is reproducible in vanilla Hyper.app**: <!-- Replace with info if applicable, or `Is Vanilla`. (Vanilla means Hyper.app without any add-ons or extras. Straight out of the box.) --> - **The issue is reproducible in vanilla Hyper.app**: <!-- Replace with info if applicable, or `Is Vanilla`. (Vanilla means Hyper.app without any add-ons or extras. Straight out of the box.) -->
## Issue ## Issue

View file

@ -22,7 +22,7 @@ const _watch = function() {
}; };
if (process.platform === 'win32') { if (process.platform === 'win32') {
// watch for changes on config every 2s on windows // watch for changes on config every 2s on Windows
// https://github.com/zeit/hyper/pull/1772 // https://github.com/zeit/hyper/pull/1772
_watcher = fs.watchFile(cfgPath, {interval: 2000}, (curr, prev) => { _watcher = fs.watchFile(cfgPath, {interval: 2000}, (curr, prev) => {
if (curr.mtime === 0) { if (curr.mtime === 0) {

View file

@ -4,8 +4,8 @@
module.exports = { module.exports = {
config: { config: {
// Choose either "stable" for receiving highly polished, // choose either `'stable'` for receiving highly polished,
// or "canary" for less polished but more frequent updates // or `'canary'` for less polished but more frequent updates
updateChannel: 'stable', updateChannel: 'stable',
// default font size in pixels for all tabs // default font size in pixels for all tabs
@ -17,10 +17,10 @@ module.exports = {
// terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk) // terminal cursor background color and opacity (hex, rgb, hsl, hsv, hwb or cmyk)
cursorColor: 'rgba(248,28,229,0.8)', cursorColor: 'rgba(248,28,229,0.8)',
// `BEAM` for |, `UNDERLINE` for _, `BLOCK` for █ // `'BEAM'` for |, `'UNDERLINE'` for _, `'BLOCK'` for █
cursorShape: 'BLOCK', cursorShape: 'BLOCK',
// set to true for blinking cursor // set to `true` (without backticks and without quotes) for blinking cursor
cursorBlink: false, cursorBlink: false,
// color of the text // color of the text
@ -32,23 +32,23 @@ module.exports = {
// border color (window, tabs) // border color (window, tabs)
borderColor: '#333', borderColor: '#333',
// custom css to embed in the main window // custom CSS to embed in the main window
css: '', css: '',
// custom css to embed in the terminal window // custom CSS to embed in the terminal window
termCSS: '', termCSS: '',
// set to `true` (without backticks and without quotes) if you're using a // set to `true` (without backticks and without quotes) if you're using a
// Linux setup that doesn't show native menus // Linux setup that doesn't show native menus
// default: `false` on Linux, `true` on Windows (ignored on macOS) // default: `false` on Linux, `true` on Windows, ignored on macOS
showHamburgerMenu: '', showHamburgerMenu: '',
// set to `false` if you want to hide the minimize, maximize and close buttons // set to `false` (without backticks and without quotes) if you want to hide the minimize, maximize and close buttons
// additionally, set to `'left'` if you want them on the left, like in Ubuntu // additionally, set to `'left'` if you want them on the left, like in Ubuntu
// default: `true` on windows and Linux (ignored on macOS) // default: `true` (without backticks and without quotes) on Windows and Linux, ignored on macOS
showWindowControls: '', showWindowControls: '',
// custom padding (css format, i.e.: `top right bottom left`) // custom padding (CSS format, i.e.: `top right bottom left`)
padding: '12px 14px', padding: '12px 14px',
// the full list. if you're going to provide the full color palette, // the full list. if you're going to provide the full color palette,
@ -83,25 +83,25 @@ module.exports = {
// Bash on Windows // Bash on Windows
// - Example: `C:\\Windows\\System32\\bash.exe` // - Example: `C:\\Windows\\System32\\bash.exe`
// //
// Powershell on Windows // PowerShell on Windows
// - Example: `C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe` // - Example: `C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`
shell: '', shell: '',
// for setting shell arguments (i.e. for using interactive shellArgs: ['-i']) // for setting shell arguments (i.e. for using interactive shellArgs: `['-i']`)
// by default ['--login'] will be used // by default `['--login']` will be used
shellArgs: ['--login'], shellArgs: ['--login'],
// for environment variables // for environment variables
env: {}, env: {},
// set to false for no bell // set to `false` for no bell
bell: 'SOUND', bell: 'SOUND',
// if true, selected text will automatically be copied to the clipboard // if `true` (without backticks and without quotes), selected text will automatically be copied to the clipboard
copyOnSelect: false, copyOnSelect: false,
// if true, on right click selected text will be copied or pasted if no // if `true` (without backticks and without quotes), on right click selected text will be copied or pasted if no
// selection is present (true by default on Windows) // selection is present (`true` by default on Windows and disables the context menu feature)
// quickEdit: true, // quickEdit: true,
// URL to custom bell // URL to custom bell

View file

@ -23,7 +23,7 @@ module.exports = class Window {
backgroundColor: toElectronBackgroundColor(cfg.backgroundColor || '#000'), backgroundColor: toElectronBackgroundColor(cfg.backgroundColor || '#000'),
titleBarStyle: 'hidden-inset', titleBarStyle: 'hidden-inset',
title: 'Hyper.app', title: 'Hyper.app',
// we want to go frameless on windows and linux // we want to go frameless on Windows and Linux
frame: process.platform === 'darwin', frame: process.platform === 'darwin',
transparent: process.platform === 'darwin', transparent: process.platform === 'darwin',
icon, icon,

View file

@ -73,10 +73,10 @@ export default class Header extends PureComponent {
const defaults = { const defaults = {
hambMenu: process.platform === 'win32', // show by default on windows hambMenu: process.platform === 'win32', // show by default on windows
winCtrls: !this.props.isMac // show by default on windows and linux winCtrls: !this.props.isMac // show by default on Windows and Linux
}; };
// don't allow the user to change defaults on MacOS // don't allow the user to change defaults on macOS
if (this.props.isMac) { if (this.props.isMac) {
return defaults; return defaults;
} }

View file

@ -10,7 +10,7 @@ const getPath = platform => {
const filepath = clipboard.read('FileNameW'); const filepath = clipboard.read('FileNameW');
return filepath.replace(new RegExp(String.fromCharCode(0), 'g'), ''); return filepath.replace(new RegExp(String.fromCharCode(0), 'g'), '');
} }
// linux already pastes full path // Linux already pastes full path
default: default:
return null; return null;
} }

View file

@ -20,7 +20,7 @@ brew update
brew cask install hyper brew cask install hyper
``` ```
If you are on windows, you can use [chocolatey](https://chocolatey.org/) to install the app by running the following command (package information can be found [here](https://chocolatey.org/packages/hyper/)): If you are on Windows, you can use [chocolatey](https://chocolatey.org/) to install the app by running the following command (package information can be found [here](https://chocolatey.org/packages/hyper/)):
```bash ```bash
choco install hyper choco install hyper