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

fix: InvalidStateError in onabort cause promise locked in pending state #1007

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

fix: InvalidStateError in onabort cause promise locked in pending state #1007

Show file tree
Hide file tree
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
24 changes: 18 additions & 6 deletions dist/localforage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,8 +1057,12 @@ function setItem(key, value, callback) {
resolve(value);
};
transaction.onabort = transaction.onerror = function () {
var err = req.error ? req.error : req.transaction.error;
reject(err);
try {
var err = req.error ? req.error : req.transaction.error;
reject(err);
} catch (e) {
reject(e);
}
};
} catch (e) {
reject(e);
Expand Down Expand Up @@ -1102,8 +1106,12 @@ function removeItem(key, callback) {
// The request will be also be aborted if we've exceeded our storage
// space.
transaction.onabort = function () {
var err = req.error ? req.error : req.transaction.error;
reject(err);
try {
var err = req.error ? req.error : req.transaction.error;
reject(err);
} catch (e) {
reject(e);
}
};
} catch (e) {
reject(e);
Expand Down Expand Up @@ -1135,8 +1143,12 @@ function clear(callback) {
};

transaction.onabort = transaction.onerror = function () {
var err = req.error ? req.error : req.transaction.error;
reject(err);
try {
var err = req.error ? req.error : req.transaction.error;
reject(err);
} catch (e) {
reject(e);
}
};
} catch (e) {
reject(e);
Expand Down
2 changes: 1 addition & 1 deletion dist/localforage.min.js
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 18 additions & 6 deletions dist/localforage.nopromises.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,8 +721,12 @@ function setItem(key, value, callback) {
resolve(value);
};
transaction.onabort = transaction.onerror = function () {
var err = req.error ? req.error : req.transaction.error;
reject(err);
try {
var err = req.error ? req.error : req.transaction.error;
reject(err);
} catch (e) {
reject(e);
}
};
} catch (e) {
reject(e);
Expand Down Expand Up @@ -766,8 +770,12 @@ function removeItem(key, callback) {
// The request will be also be aborted if we've exceeded our storage
// space.
transaction.onabort = function () {
var err = req.error ? req.error : req.transaction.error;
reject(err);
try {
var err = req.error ? req.error : req.transaction.error;
reject(err);
} catch (e) {
reject(e);
}
};
} catch (e) {
reject(e);
Expand Down Expand Up @@ -799,8 +807,12 @@ function clear(callback) {
};

transaction.onabort = transaction.onerror = function () {
var err = req.error ? req.error : req.transaction.error;
reject(err);
try {
var err = req.error ? req.error : req.transaction.error;
reject(err);
} catch (e) {
reject(e);
}
};
} catch (e) {
reject(e);
Expand Down
2 changes: 1 addition & 1 deletion dist/localforage.nopromises.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"grunt-contrib-watch": "^0.5.0",
"grunt-es3-safe-recast": "^0.1.0",
"grunt-eslint": "^20.0.0",
"mocha-headless-chrome": "3.1.0",
"grunt-rollup": "^0.6.2",
"grunt-run": "^0.5.2",
"grunt-saucelabs": "^5.1.2",
Expand All @@ -54,6 +53,7 @@
"lint-staged": "^8.1.7",
"load-grunt-tasks": "^0.4.0",
"mocha": "^3.4.2",
"mocha-headless-chrome": "3.1.0",
"prettier": "~1.12.0",
"rollupify": "^0.1.0",
"script-loader": "^0.6.1",
Expand Down
36 changes: 24 additions & 12 deletions src/drivers/indexeddb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,10 +665,14 @@ function setItem(key, value, callback) {
resolve(value);
};
transaction.onabort = transaction.onerror = function() {
var err = req.error
? req.error
: req.transaction.error;
reject(err);
try {
var err = req.error
? req.error
: req.transaction.error;
reject(err);
} catch (e) {
reject(e);
}
};
} catch (e) {
reject(e);
Expand Down Expand Up @@ -720,10 +724,14 @@ function removeItem(key, callback) {
// The request will be also be aborted if we've exceeded our storage
// space.
transaction.onabort = function() {
var err = req.error
? req.error
: req.transaction.error;
reject(err);
try {
var err = req.error
? req.error
: req.transaction.error;
reject(err);
} catch (e) {
reject(e);
}
};
} catch (e) {
reject(e);
Expand Down Expand Up @@ -763,10 +771,14 @@ function clear(callback) {
};

transaction.onabort = transaction.onerror = function() {
var err = req.error
? req.error
: req.transaction.error;
reject(err);
try {
var err = req.error
? req.error
: req.transaction.error;
reject(err);
} catch (e) {
reject(e);
}
};
} catch (e) {
reject(e);
Expand Down