Merge remote-tracking branch 'upstream/master' into 570_link_validation

This commit is contained in:
Daniel Imms
2017-02-27 12:47:53 -08:00
+19 -4
View File
@@ -48,14 +48,29 @@ Xterm.js works seamlessly in Electron apps and may even work on earlier versions
## Demo ## Demo
To launch the demo simply run: ### Linux or macOS
Run the following commands:
``` ```
npm install $ npm install
npm start $ npm start
``` ```
Then open http://0.0.0.0:3000 in a web browser (use http://127.0.0.1:3000 if running under Windows). Then open http://0.0.0.0:3000 in a web browser.
### Windows
First, ensure [node-gyp](https://github.com/nodejs/node-gyp) is installed and configured correctly, then run these commands.
Note: Do not use ConEmu, as it seems to break the demo for some reason.
```
> npm install
> npm start
```
Then open http://127.0.0.1:3000 in a web browser.
## Getting Started ## Getting Started