dexie 1.5.0 → 1.5.1

package/dist/dexie.js

@@ -10,7 +10,7 @@
 *
 * By David Fahlander, david.fahlander@gmail.com
 *
-* Version 1.5.0, Thu Oct 13 2016
+* Version 1.5.1, Tue Nov 01 2016
 * www.dexie.com
 * Apache License Version 2.0, January 2004, http://www.apache.org/licenses/
 */
@@ -1427,14 +1427,14 @@ function rejection(err, uncaughtHandler) {
  *
  * By David Fahlander, david.fahlander@gmail.com
  *
- * Version 1.5.0, Thu Oct 13 2016
+ * Version 1.5.1, Tue Nov 01 2016
  *
  * http://dexie.org
  *
  * Apache License Version 2.0, January 2004, http://www.apache.org/licenses/
  */
 
-var DEXIE_VERSION = '1.5.0';
+var DEXIE_VERSION = '1.5.1';
 var maxString = String.fromCharCode(65535);
 var maxKey = function () {
     try {
@@ -2784,9 +2784,9 @@ function Dexie(dbName, options) {
             if (--this._reculock === 0) {
                 if (!PSD.global) PSD.lockOwnerFor = null;
                 while (this._blockedFuncs.length > 0 && !this._locked()) {
-                    var fn = this._blockedFuncs.shift();
+                    var fnAndPSD = this._blockedFuncs.shift();
                     try {
-                        fn();
+                        usePSD(fnAndPSD[1], fnAndPSD[0]);
                     } catch (e) {}
                 }
             }
@@ -2844,30 +2844,27 @@ function Dexie(dbName, options) {
         },
         _promise: function (mode, fn, bWriteLock) {
             var self = this;
-            return newScope(function () {
-                var p;
-                // Read lock always
-                if (!self._locked()) {
-                    p = self.active ? new Promise(function (resolve, reject) {
-                        if (mode === READWRITE && self.mode !== READWRITE) throw new exceptions.ReadOnly("Transaction is readonly");
-                        if (!self.idbtrans && mode) self.create();
-                        if (bWriteLock) self._lock(); // Write lock if write operation is requested
-                        fn(resolve, reject, self);
-                    }) : rejection(new exceptions.TransactionInactive());
-                    if (self.active && bWriteLock) p.finally(function () {
-                        self._unlock();
-                    });
-                } else {
-                    // Transaction is write-locked. Wait for mutex.
-                    p = new Promise(function (resolve, reject) {
-                        self._blockedFuncs.push(function () {
-                            self._promise(mode, fn, bWriteLock).then(resolve, reject);
-                        });
-                    });
-                }
-                p._lib = true;
-                return p.uncaught(dbUncaught);
+            var p = self._locked() ?
+            // Read lock always. Transaction is write-locked. Wait for mutex.
+            new Promise(function (resolve, reject) {
+                self._blockedFuncs.push([function () {
+                    self._promise(mode, fn, bWriteLock).then(resolve, reject);
+                }, PSD]);
+            }) : newScope(function () {
+                var p_ = self.active ? new Promise(function (resolve, reject) {
+                    if (mode === READWRITE && self.mode !== READWRITE) throw new exceptions.ReadOnly("Transaction is readonly");
+                    if (!self.idbtrans && mode) self.create();
+                    if (bWriteLock) self._lock(); // Write lock if write operation is requested
+                    fn(resolve, reject, self);
+                }) : rejection(new exceptions.TransactionInactive());
+                if (self.active && bWriteLock) p_.finally(function () {
+                    self._unlock();
+                });
+                return p_;
             });
+
+            p._lib = true;
+            return p.uncaught(dbUncaught);
         },
 
         //