You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2017/10/20 22:50:40 UTC
[cordova-browser] branch master updated: updated .gitignore
This is an automated email from the ASF dual-hosted git repository.
steven pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-browser.git
The following commit(s) were added to refs/heads/master by this push:
new cd18027 updated .gitignore
cd18027 is described below
commit cd18027618881ece298e922c7c9204c12ca4daba
Author: Steve Gill <st...@gmail.com>
AuthorDate: Fri Oct 20 15:50:34 2017 -0700
updated .gitignore
---
.gitignore | 1 +
node_modules/q/CHANGES.md | 8 ++++++++
node_modules/q/package.json | 22 +++++++++++-----------
node_modules/q/q.js | 9 ++++++---
4 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1db634f..24bd20a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ node_modules/
!node_modules/nopt
!node_modules/q
!node_modules/shelljs
+!node_modules/cordova-common
diff --git a/node_modules/q/CHANGES.md b/node_modules/q/CHANGES.md
index 2d845a3..766fcdc 100644
--- a/node_modules/q/CHANGES.md
+++ b/node_modules/q/CHANGES.md
@@ -1,3 +1,11 @@
+
+## 1.5.1
+
+ - Q.any now annotates its error message to clarify that Q.any was involved and
+ includes only the last error emitted. (Ivan Etchart)
+ - Avoid domain.dispose during tests in preparation for Node.js 9. (Anna
+ Henningsen)
+
## 1.5.0
- Q.any gives an error message from the last rejected promise
diff --git a/node_modules/q/package.json b/node_modules/q/package.json
index eb85ed8..2f5d5b3 100644
--- a/node_modules/q/package.json
+++ b/node_modules/q/package.json
@@ -14,19 +14,19 @@
]
],
"_from": "q@>=1.4.1 <2.0.0",
- "_id": "q@1.5.0",
+ "_id": "q@1.5.1",
"_inCache": true,
"_location": "/q",
- "_nodeVersion": "6.9.5",
+ "_nodeVersion": "0.10.32",
"_npmOperationalInternal": {
- "host": "packages-18-east.internal.npmjs.com",
- "tmp": "tmp/q-1.5.0.tgz_1490148893963_0.4695124195422977"
+ "host": "s3://npm-registry-packages",
+ "tmp": "tmp/q-1.5.1.tgz_1508435736930_0.7891315249726176"
},
"_npmUser": {
"name": "kriskowal",
"email": "kris.kowal@cixar.com"
},
- "_npmVersion": "3.10.10",
+ "_npmVersion": "2.14.2",
"_phantomChildren": {},
"_requested": {
"raw": "q@^1.4.1",
@@ -40,8 +40,8 @@
"_requiredBy": [
"/cordova-common"
],
- "_resolved": "http://registry.npmjs.org/q/-/q-1.5.0.tgz",
- "_shasum": "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1",
+ "_resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+ "_shasum": "7e32f75b41381291d04611f1bf14109ac00651d7",
"_shrinkwrap": null,
"_spec": "q@^1.4.1",
"_where": "/Users/steveng/repo/cordova/cordova-browser/node_modules/cordova-common",
@@ -87,8 +87,8 @@
"test": "./spec"
},
"dist": {
- "shasum": "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1",
- "tarball": "https://registry.npmjs.org/q/-/q-1.5.0.tgz"
+ "shasum": "7e32f75b41381291d04611f1bf14109ac00651d7",
+ "tarball": "https://registry.npmjs.org/q/-/q-1.5.1.tgz"
},
"engines": {
"node": ">=0.6.0",
@@ -99,7 +99,7 @@
"q.js",
"queue.js"
],
- "gitHead": "4fecabe07ff9f3683a3d4548e7f81c2aba693326",
+ "gitHead": "c2f5a6f35456389a806acca50bfd929cbe30c4cb",
"homepage": "https://github.com/kriskowal/q",
"keywords": [
"q",
@@ -151,5 +151,5 @@
"test": "npm ls -s && jasmine-node spec && promises-aplus-tests spec/aplus-adapter && npm run -s lint",
"test-browser": "opener spec/q-spec.html"
},
- "version": "1.5.0"
+ "version": "1.5.1"
}
diff --git a/node_modules/q/q.js b/node_modules/q/q.js
index 14dc24a..6e46795 100644
--- a/node_modules/q/q.js
+++ b/node_modules/q/q.js
@@ -1645,9 +1645,12 @@ function any(promises) {
function onRejected(err) {
pendingCount--;
if (pendingCount === 0) {
- err.message = ("Q can't get fulfillment value from any promise, all " +
- "promises were rejected. Last error message: " + err.message);
- deferred.reject(err);
+ var rejection = err || new Error("" + err);
+
+ rejection.message = ("Q can't get fulfillment value from any promise, all " +
+ "promises were rejected. Last error message: " + rejection.message);
+
+ deferred.reject(rejection);
}
}
function onProgress(progress) {
--
To stop receiving notification emails like this one, please contact
['"commits@cordova.apache.org" <co...@cordova.apache.org>'].
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org