Merge remote-tracking branch 'origin/master'

This commit is contained in:
jos 2015-03-22 21:14:58 +01:00
commit a9e86715fb
1 changed files with 11 additions and 4 deletions

View File

@ -110,11 +110,15 @@ jsoneditor:
- Install dependencies: - Install dependencies:
npm install ```
npm install
```
- Build JSON Editor: - Build JSON Editor:
npm run build ```
npm run build
```
This will generate the files `./jsoneditor.js`, `./jsoneditor.css`, and This will generate the files `./jsoneditor.js`, `./jsoneditor.css`, and
minified versions in the root of the project. minified versions in the root of the project.
@ -122,8 +126,11 @@ jsoneditor:
## Custom builds ## Custom builds
The source code of JSONEditor consists of CommonJS modules. To create a custom The source code of JSONEditor consists of CommonJS modules. JSONEditor can be bundled in a customized way using a module bundler like [browserify](http://browserify.org/) or [webpack](http://webpack.github.io/). First, install all dependencies of jsoneditor:
bundle of the source code, [browserify](http://browserify.org/) can be used:
npm install
To create a custom bundle of the source code using browserify:
browserify ./index.js -o ./jsoneditor.custom.js -s JSONEditor browserify ./index.js -o ./jsoneditor.custom.js -s JSONEditor