Upgrade to Bluebird 3.1.1

2016-01-08 21:07:10 -05:00 · 2016-01-08 21:07:10 -05:00 · 2ac27be95e
commit 2ac27be95e
parent a8c364d830
2 changed files with 2696 additions and 2265 deletions
--- a/chrome/content/zotero/xpcom/db.js
+++ b/chrome/content/zotero/xpcom/db.js
@ -582,7 +582,7 @@ Zotero.DBConnection.prototype.inTransaction = function () {

 Zotero.DBConnection.prototype.waitForTransaction = function () {
 	if (!this._inTransaction) {
-		return Zotero.Promise.resolve().cancellable();
+		return Zotero.Promise.resolve();
 	}
 	if (Zotero.Debug.enabled) {
 		Zotero.debug("Waiting for transaction to finish", 5);
--- a/resource/bluebird.js
+++ b/resource/bluebird.js