Skip to content

Fix loading libraty in browsers without support IndexedDB #70

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix loading libraty in browsers without support IndexedDB #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5241859
Fix loading libraty in browsers without support IndexedDB
faiwer Feb 11, 2016
3ebcbf5
update dist directory too
faiwer Feb 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions dist/jquery.indexeddb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function($, undefined) {
(window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB) && (function($, undefined) {
'use strict';
var indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
var IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange;
Expand Down Expand Up @@ -61,28 +61,28 @@
try {
var idbRequest = typeof req === "function" ? req(args) : req;
idbRequest.onsuccess = function(e) {

dfd.resolveWith(idbRequest, [idbRequest.result, e]);
};
idbRequest.onerror = function(e) {

dfd.rejectWith(idbRequest, [idbRequest.error, e]);
};
if (typeof idbRequest.onblocked !== "undefined" && idbRequest.onblocked === null) {
idbRequest.onblocked = function(e) {

var res;
try {
res = idbRequest.result;
} catch (e) {
res = null; // Required for Older Chrome versions, accessing result causes error
res = null; // Required for Older Chrome versions, accessing result causes error
}
dfd.notifyWith(idbRequest, [res, e]);
};
}
if (typeof idbRequest.onupgradeneeded !== "undefined" && idbRequest.onupgradeneeded === null) {
idbRequest.onupgradeneeded = function(e) {

dfd.notifyWith(idbRequest, [idbRequest.result, e]);
};
}
Expand Down Expand Up @@ -189,16 +189,16 @@
"cursor": function(idbCursor, callback) {
return $.Deferred(function(dfd) {
try {

var cursorReq = typeof idbCursor === "function" ? idbCursor() : idbCursor;
cursorReq.onsuccess = function(e) {

if (!cursorReq.result) {
dfd.resolveWith(cursorReq, [null, e]);
return;
}
var elem = {
// Delete, update do not move
// Delete, update do not move
"delete": function() {
return wrap.request(function() {
return cursorReq.result["delete"]();
Expand All @@ -215,10 +215,10 @@
"key": cursorReq.result.key,
"value": cursorReq.result.value
};

dfd.notifyWith(cursorReq, [elem, e]);
var result = callback.apply(cursorReq, [elem]);

try {
if (result === false) {
dfd.resolveWith(cursorReq, [null, e]);
Expand All @@ -229,16 +229,16 @@
else cursorReq.result["continue"]();
}
} catch (e) {

dfd.rejectWith(cursorReq, [cursorReq.result, e]);
}
};
cursorReq.onerror = function(e) {

dfd.rejectWith(cursorReq, [cursorReq.result, e]);
};
} catch (e) {

e.type = "exception";
dfd.rejectWith(cursorReq, [null, e]);
}
Expand All @@ -251,7 +251,7 @@
} catch (e) {
idbIndex = null;
}

return {
"each": function(callback, range, direction) {
return wrap.cursor(function() {
Expand Down Expand Up @@ -300,25 +300,25 @@

// Start with opening the database
var dbPromise = wrap.request(function() {

return version ? indexedDB.open(dbName, parseInt(version)) : indexedDB.open(dbName);
});
dbPromise.then(function(db, e) {

db.onversionchange = function() {
// Try to automatically close the database if there is a version change request
if (!(config && config.onversionchange && config.onversionchange() !== false)) {
db.close();
}
};
}, function(error, e) {

// Nothing much to do if an error occurs
}, function(db, e) {
if (e && e.type === "upgradeneeded") {
if (config && config.schema) {
// Assuming that version is always an integer
// Assuming that version is always an integer

for (var i = e.oldVersion + 1; i <= e.newVersion; i++) {
typeof config.schema[i] === "function" && config.schema[i].call(this, wrap.transaction(this.transaction));
}
Expand All @@ -334,8 +334,8 @@
return indexedDB.cmp(key1, key2);
},
"deleteDatabase": function() {
// Kinda looks ugly coz DB is opened before it needs to be deleted.
// Blame it on the API
// Kinda looks ugly coz DB is opened before it needs to be deleted.
// Blame it on the API
return $.Deferred(function(dfd) {
dbPromise.then(function(db, e) {
db.close();
Expand All @@ -362,17 +362,17 @@
dbPromise.then(function(db, e) {
var idbTransaction;
try {

idbTransaction = db.transaction(storeNames, mode);

idbTransaction.onabort = idbTransaction.onerror = function(e) {
dfd.rejectWith(idbTransaction, [e]);
};
idbTransaction.oncomplete = function(e) {
dfd.resolveWith(idbTransaction, [e]);
};
} catch (e) {

e.type = "exception";
dfd.rejectWith(this, [e]);
return;
Expand All @@ -386,7 +386,7 @@
}, function(err, e) {
dfd.rejectWith(this, [e, err]);
}, function(res, e) {

//dfd.notifyWith(this, ["", e]);
});

Expand All @@ -400,60 +400,60 @@
return $.Deferred(function(dfd) {
function onTransactionProgress(trans, callback) {
try {

callback(trans.objectStore(storeName)).then(function(result, e) {
dfd.resolveWith(this, [result, e]);
}, function(err, e) {
dfd.rejectWith(this, [err, e]);
});
} catch (e) {

e.name = "exception";
dfd.rejectWith(trans, [e, e]);
}
}
me.transaction(storeName, getDefaultTransaction(mode)).then(function() {

// Nothing to do when transaction is complete
}, function(err, e) {
// If transaction fails, CrudOp fails
if (err.code === err.NOT_FOUND_ERR && (mode === true || typeof mode === "object")) {

var db = this.result;
db.close();
dbPromise = wrap.request(function() {

return indexedDB.open(dbName, (parseInt(db.version, 10) || 1) + 1);
});
dbPromise.then(function(db, e) {

db.onversionchange = function() {
// Try to automatically close the database if there is a version change request
if (!(config && config.onversionchange && config.onversionchange() !== false)) {
db.close();
}
};
me.transaction(storeName, getDefaultTransaction(mode)).then(function() {

// Nothing much to do
}, function(err, e) {
dfd.rejectWith(this, [err, e]);
}, function(trans, e) {

onTransactionProgress(trans, callback);
});
}, function(err, e) {
dfd.rejectWith(this, [err, e]);
}, function(db, e) {
if (e.type === "upgradeneeded") {
try {

db.createObjectStore(storeName, mode === true ? {
"autoIncrement": true
} : mode);

} catch (ex) {

dfd.rejectWith(this, [ex, e]);
}
}
Expand All @@ -462,7 +462,7 @@
dfd.rejectWith(this, [err, e]);
}
}, function(trans) {

onTransactionProgress(trans, callback);
});
});
Expand Down
4 changes: 2 additions & 2 deletions src/jquery.indexeddb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function($, undefined) {
(window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB) && (function($, undefined) {
'use strict';
var indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
var IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange;
Expand Down Expand Up @@ -519,4 +519,4 @@
$.indexedDB.IDBCursor = IDBCursor;
$.indexedDB.IDBTransaction = IDBTransaction;
$.idb = $.indexedDB;
})(jQuery);
})(jQuery);