Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Less .catch(reject) -> less in mem promises in IndexedDb driver #1034

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Less .catch(reject) -> less in mem promises in IndexedDb driver #1034

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
122 changes: 55 additions & 67 deletions src/drivers/indexeddb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,10 +503,10 @@ function getItem(key, callback) {

key = normalizeKey(key);

var promise = new Promise(function(resolve, reject) {
self
.ready()
.then(function() {
var promise = self
.ready()
.then(function() {
return new Promise(function (resolve, reject) {
createTransaction(self._dbInfo, READ_ONLY, function(
err,
transaction
Expand Down Expand Up @@ -539,9 +539,8 @@ function getItem(key, callback) {
reject(e);
}
});
})
.catch(reject);
});
});
});

executeCallback(promise, callback);
return promise;
Expand All @@ -551,10 +550,10 @@ function getItem(key, callback) {
function iterate(iterator, callback) {
var self = this;

var promise = new Promise(function(resolve, reject) {
self
.ready()
.then(function() {
var promise = self
.ready()
.then(function() {
return new Promise(function (resolve, reject) {
createTransaction(self._dbInfo, READ_ONLY, function(
err,
transaction
Expand Down Expand Up @@ -604,9 +603,8 @@ function iterate(iterator, callback) {
reject(e);
}
});
})
.catch(reject);
});
});
});

executeCallback(promise, callback);

Expand All @@ -618,14 +616,11 @@ function setItem(key, value, callback) {

key = normalizeKey(key);

var promise = new Promise(function(resolve, reject) {
var dbInfo;
self
.ready()
.then(function() {
dbInfo = self._dbInfo;
var promise = self
.ready()
.then(function() {
if (toString.call(value) === '[object Blob]') {
return _checkBlobSupport(dbInfo.db).then(function(
return _checkBlobSupport(self._dbInfo.db).then(function(
blobSupport
) {
if (blobSupport) {
Expand All @@ -635,8 +630,9 @@ function setItem(key, value, callback) {
});
}
return value;
})
.then(function(value) {
})
.then(function(value) {
return new Promise(function (resolve, reject) {
createTransaction(self._dbInfo, READ_WRITE, function(
err,
transaction
Expand Down Expand Up @@ -683,9 +679,8 @@ function setItem(key, value, callback) {
reject(e);
}
});
})
.catch(reject);
});
});
});

executeCallback(promise, callback);
return promise;
Expand All @@ -696,10 +691,10 @@ function removeItem(key, callback) {

key = normalizeKey(key);

var promise = new Promise(function(resolve, reject) {
self
.ready()
.then(function() {
var promise = self
.ready()
.then(function() {
return new Promise(function (resolve, reject) {
createTransaction(self._dbInfo, READ_WRITE, function(
err,
transaction
Expand All @@ -726,7 +721,7 @@ function removeItem(key, callback) {
reject(req.error);
};

// The request will be also be aborted if we've exceeded our storage
// The request will also be aborted if we've exceeded our storage
// space.
transaction.onabort = function() {
var err = req.error
Expand All @@ -738,9 +733,8 @@ function removeItem(key, callback) {
reject(e);
}
});
})
.catch(reject);
});
});
});

executeCallback(promise, callback);
return promise;
Expand All @@ -749,10 +743,10 @@ function removeItem(key, callback) {
function clear(callback) {
var self = this;

var promise = new Promise(function(resolve, reject) {
self
.ready()
.then(function() {
var promise = self
.ready()
.then(function() {
return new Promise(function (resolve, reject) {
createTransaction(self._dbInfo, READ_WRITE, function(
err,
transaction
Expand Down Expand Up @@ -781,9 +775,8 @@ function clear(callback) {
reject(e);
}
});
})
.catch(reject);
});
});
});

executeCallback(promise, callback);
return promise;
Expand All @@ -792,10 +785,10 @@ function clear(callback) {
function length(callback) {
var self = this;

var promise = new Promise(function(resolve, reject) {
self
.ready()
.then(function() {
var promise = self
.ready()
.then(function() {
return new Promise(function (resolve, reject) {
createTransaction(self._dbInfo, READ_ONLY, function(
err,
transaction
Expand All @@ -821,9 +814,8 @@ function length(callback) {
reject(e);
}
});
})
.catch(reject);
});
});
});

executeCallback(promise, callback);
return promise;
Expand All @@ -832,16 +824,14 @@ function length(callback) {
function key(n, callback) {
var self = this;

var promise = new Promise(function(resolve, reject) {
if (n < 0) {
resolve(null);

return;
}
if (n < 0) {
return Promise.resolve(null);
}

self
.ready()
.then(function() {
var promise = self
.ready()
.then(function() {
return new Promise(function (resolve, reject) {
createTransaction(self._dbInfo, READ_ONLY, function(
err,
transaction
Expand Down Expand Up @@ -890,9 +880,8 @@ function key(n, callback) {
reject(e);
}
});
})
.catch(reject);
});
});
});

executeCallback(promise, callback);
return promise;
Expand All @@ -901,10 +890,10 @@ function key(n, callback) {
function keys(callback) {
var self = this;

var promise = new Promise(function(resolve, reject) {
self
.ready()
.then(function() {
var promise = self
.ready()
.then(function() {
return new Promise(function (resolve, reject) {
createTransaction(self._dbInfo, READ_ONLY, function(
err,
transaction
Expand Down Expand Up @@ -939,9 +928,8 @@ function keys(callback) {
reject(e);
}
});
})
.catch(reject);
});
});
});

executeCallback(promise, callback);
return promise;
Expand Down