Skip to content

Commit

Permalink
Merge branch 'release/5.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dirk Lüth authored and Dirk Lüth committed Feb 22, 2018
2 parents 6cfd13a + 74c0a0f commit 8ab879a
Show file tree
Hide file tree
Showing 28 changed files with 189 additions and 50 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ The last parameter of the above code snippet is a configuration object. It just
lifetime: 60,

// sets the timeout for XHR requests
// optional, defaults to "8" (limited to "2" up to "12")
// optional, defaults to "8" (limited to "2" up to "20")
// unit: seconds
timeout: 8,

Expand Down Expand Up @@ -423,7 +423,7 @@ Demand also provides means to get information of the state of modules. Similar t
```javascript
// get a list of all handlers and their modules ...
// ... regardless of state
demand.list.all();
demand.list();

// ... being currently loaded/resolved
demand.list.pending();
Expand Down
2 changes: 1 addition & 1 deletion dist/cache/dispose.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/cache/dispose.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/demand.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/demand.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/handler/css.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/handler/css.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/handler/html.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8ab879a

Please sign in to comment.