Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
briancavalier committed May 9, 2014
2 parents 13b91c2 + f52bbca commit 8762454
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions docs/installation.md
Expand Up @@ -62,10 +62,10 @@ Since when.js primarily targets modular environments, it doesn't export to the g
1. `git clone https://github.com/cujojs/when`
1. `npm install`
1. `npm run browserify` to generate `build/when.js`
1. Or `npm run browserify-debug` to build with [when/monitor/console](docs/api.md#debugging-promises) enabled
1. Or `npm run browserify-debug` to build with [when/monitor/console](api.md#debugging-promises) enabled
1. `<script src="path/to/when/build/when.js"></script>`
1. `when` will be available as `window.when`
1. Other modules will be available as sub-objects/functions, e.g. `window.when.fn.lift`, `window.when.sequence`. See the [full sub-namespace list in the browserify build file](build/when.browserify.js)
1. Other modules will be available as sub-objects/functions, e.g. `window.when.fn.lift`, `window.when.sequence`. See the [full sub-namespace list in the browserify build file](../build/when.browserify.js)

#### Web Worker (via browserify)

Expand All @@ -74,7 +74,7 @@ Similarly to browser global environments:
1. `git clone https://github.com/cujojs/when`
1. `npm install`
1. `npm run browserify` to generate `build/when.js`
1. Or `npm run browserify-debug` to build with [when/monitor/console](docs/api.md#debugging-promises) enabled
1. Or `npm run browserify-debug` to build with [when/monitor/console](api.md#debugging-promises) enabled
1. `importScripts('path/to/when/build/when.js');`
1. `when` will be available as `self.when`
1. Other modules will be available as sub-objects/functions, e.g. `self.when.fn.lift`, `self.when.sequence`. See the [full sub-namespace list in the browserify build file](build/when.browserify.js)
1. Other modules will be available as sub-objects/functions, e.g. `self.when.fn.lift`, `self.when.sequence`. See the [full sub-namespace list in the browserify build file](../build/when.browserify.js)

0 comments on commit 8762454

Please sign in to comment.