Skip to content

Commit

Permalink
Bump version, rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
briancavalier committed Nov 21, 2015
1 parent e7a6c88 commit 92eae6b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
10 changes: 10 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
### 3.7.5

* Improve unhandled rejection formatting in ie8

### 3.7.4

* Add `when/keys settle`, for settling a hash of promises.
* Use `poly` from npm instead of a git link in package.json. No need for git to be available to npm install when.
* Various community-contributed documentation updates. Thanks!

### 3.7.3

* Fix console.log check when using `monitor/console` in IE8.
Expand Down
2 changes: 1 addition & 1 deletion es6-shim/Promise.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ define(function() {
* @returns {String} formatted string, suitable for output to developers
*/
function formatError(e) {
var s = typeof e === 'object' && e !== null && e.stack ? e.stack : formatObject(e);
var s = typeof e === 'object' && e !== null && (e.stack || e.message) ? e.stack || e.message : formatObject(e);
return e instanceof Error ? s : s + ' (WARNING: non-Error used)';
}

Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "when",
"version": "3.7.4",
"version": "3.7.5",
"description": "A lightweight Promises/A+ and when() implementation, plus other async goodies.",
"keywords": [
"cujo",
Expand Down Expand Up @@ -84,6 +84,8 @@
"tunnel": "node test/sauce.js -m",
"start": "buster-static -e browser",
"benchmark": "node benchmark/promise && node benchmark/map",
"prepublish": "npm run browserify-es6",
"preversion": "npm run browserify-es6",
"browserify-es6": "browserify -s Promise es6-shim/Promise.browserify-es6.js --no-detect-globals -o es6-shim/Promise.js",
"browserify": "browserify -s when build/when.browserify.js --no-detect-globals -o build/when.js",
"browserify-debug": "browserify -s when build/when.browserify-debug.js --no-detect-globals -o build/when.js"
Expand Down

0 comments on commit 92eae6b

Please sign in to comment.