quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-12 20:18:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/issue_template.md vendored
View file

@ -1,7 +1,7 @@
<!--
Hi there! Thank you for discovering and submitting an issue.
Hi there! Thank you for discovering and submitting an issue.
Before you submit this; let's make sure of a few things.
Before you submit this; let's make sure of a few things.
Please make sure the following boxes are ticked if they are correct.
If not, please try and fulfil these first.
-->
@ -10,7 +10,7 @@
- [ ] I am on the [latest](https://github.com/zeit/hyper/releases/latest) Hyper.app version
- [ ] I have searched the [issues](https://github.com/zeit/hyper/issues) of this repo and believe that this is not a duplicate
<!--
<!--
Once those are done, if you're able to fill in the following list with your information,
it'd be very helpful to whoever handles the issue.
-->
@ -18,7 +18,7 @@
- **OS version and name**: <!-- Replace with version + name -->
- **Hyper.app version**: <!-- Replace with version -->
- **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.) -->
## Issue

2
app/config.js
View file

@ -22,7 +22,7 @@ const _watch = function() {
};
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
_watcher = fs.watchFile(cfgPath, {interval: 2000}, (curr, prev) => {
if (curr.mtime === 0) {

34
app/config/config-default.js
View file

@ -4,8 +4,8 @@
module.exports = {
config: {
// Choose either "stable" for receiving highly polished,
// or "canary" for less polished but more frequent updates
// choose either `'stable'` for receiving highly polished,
// or `'canary'` for less polished but more frequent updates
updateChannel: 'stable',
// 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)
cursorColor: 'rgba(248,28,229,0.8)',
// `BEAM` for |, `UNDERLINE` for _, `BLOCK` for █
// `'BEAM'` for |, `'UNDERLINE'` for _, `'BLOCK'` for █
cursorShape: 'BLOCK',
// set to true for blinking cursor
// set to `true` (without backticks and without quotes) for blinking cursor
cursorBlink: false,
// color of the text
@ -32,23 +32,23 @@ module.exports = {
// border color (window, tabs)
borderColor: '#333',
// custom css to embed in the main window
// custom CSS to embed in the main window
css: '',
// custom css to embed in the terminal window
// custom CSS to embed in the terminal window
termCSS: '',
// set to `true` (without backticks and without quotes) if you're using a
// 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: '',
// 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
// default: `true` on windows and Linux (ignored on macOS)
// default: `true` (without backticks and without quotes) on Windows and Linux, ignored on macOS
showWindowControls: '',
// custom padding (css format, i.e.: `top right bottom left`)
// custom padding (CSS format, i.e.: `top right bottom left`)
padding: '12px 14px',
// the full list. if you're going to provide the full color palette,
@ -83,25 +83,25 @@ module.exports = {
// Bash on Windows
// - Example: `C:\\Windows\\System32\\bash.exe`
//
// Powershell on Windows
// PowerShell on Windows
// - Example: `C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`
shell: '',
// for setting shell arguments (i.e. for using interactive shellArgs: ['-i'])
// by default ['--login'] will be used
// for setting shell arguments (i.e. for using interactive shellArgs: `['-i']`)
// by default `['--login']` will be used
shellArgs: ['--login'],
// for environment variables
env: {},
// set to false for no bell
// set to `false` for no bell
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,
// if true, on right click selected text will be copied or pasted if no
// selection is present (true by default on Windows)
// 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 and disables the context menu feature)
// quickEdit: true,
// URL to custom bell

2
app/ui/window.js
View file

@ -23,7 +23,7 @@ module.exports = class Window {
backgroundColor: toElectronBackgroundColor(cfg.backgroundColor || '#000'),
titleBarStyle: 'hidden-inset',
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',
transparent: process.platform === 'darwin',
icon,

4
lib/components/header.js
View file

@ -73,10 +73,10 @@ export default class Header extends PureComponent {
const defaults = {
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) {
return defaults;
}

2
lib/utils/paste.js
View file

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

6
readme.md
View file

@ -20,7 +20,7 @@ brew update
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
choco install hyper
@ -51,8 +51,8 @@ Regardless of the platform you are working on, you will need to have Yarn instal
4. Build the code and watch for changes: `yarn run dev`
5. To run `hyper`
* `yarn run app` from another terminal tab/window/pane
* If you are using **Visual Studio Code**, select `Launch Hyper` in debugger configuration to launch a new Hyper instance with debugger attached.
* If you are using **Visual Studio Code**, select `Launch Hyper` in debugger configuration to launch a new Hyper instance with debugger attached.
To make sure that your code works in the finished application, you can generate the binaries like this:
```bash