gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify callbacks

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2014-08-22 10:38:39 +05:30
parent f203366c83
commit c2bcb4f844
3 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
js/pmd/designer_db.js
View File

@ -5,8 +5,7 @@ var DesignerOfflineDB = (function () {
var designerDB = {};
var datastore = null;
designerDB.open = function (callback)
{
designerDB.open = function (callback) {
var version = 1;
var request = window.indexedDB.open("pmd_designer", version);
@ -29,7 +28,7 @@ var DesignerOfflineDB = (function () {
request.onsuccess = function (e) {
datastore = e.target.result;
if (callback != null) {
if (typeof callback !== 'undefined' && callback != null) {
callback(true);
}
};
@ -37,29 +36,25 @@ var DesignerOfflineDB = (function () {
request.onerror = designerDB.onerror;
};
designerDB.loadObject = function (table, id, callback)
{
designerDB.loadObject = function (table, id, callback) {
var db = datastore;
var transaction = db.transaction([table], 'readwrite');
var objStore = transaction.objectStore(table);
var cursorRequest = objStore.get(parseInt(id));
cursorRequest.onsuccess = function (e) {
var result = e.target.result;
callback(result);
callback(e.target.result);
};
cursorRequest.onerror = designerDB.onerror;
};
designerDB.loadAllObjects = function (table, callback)
{
designerDB.loadAllObjects = function (table, callback) {
var db = datastore;
var transaction = db.transaction([table], 'readwrite');
var objStore = transaction.objectStore(table);
var keyRange = IDBKeyRange.lowerBound(0);
var cursorRequest = objStore.openCursor(keyRange);
var results = [];
transaction.oncomplete = function (e) {
@ -68,7 +63,6 @@ var DesignerOfflineDB = (function () {
cursorRequest.onsuccess = function (e) {
var result = e.target.result;
if (!!result == false) {
return;
}
@ -79,14 +73,12 @@ var DesignerOfflineDB = (function () {
cursorRequest.onerror = designerDB.onerror;
};
designerDB.loadFirstObject = function(table, callback)
{
designerDB.loadFirstObject = function(table, callback) {
var db = datastore;
var transaction = db.transaction([table], 'readwrite');
var objStore = transaction.objectStore(table);
var keyRange = IDBKeyRange.lowerBound(0);
var cursorRequest = objStore.openCursor(keyRange);
var firstResult = null;
transaction.oncomplete = function(e) {
@ -95,7 +87,6 @@ var DesignerOfflineDB = (function () {
cursorRequest.onsuccess = function(e) {
var result = e.target.result;
if (!!result == false) {
return;
}
@ -105,38 +96,40 @@ var DesignerOfflineDB = (function () {
cursorRequest.onerror = designerDB.onerror;
};
designerDB.addObject = function(table, obj, callback)
{
designerDB.addObject = function(table, obj, callback) {
var db = datastore;
var transaction = db.transaction([table], 'readwrite');
var objStore = transaction.objectStore(table);
var request = objStore.put(obj);
request.onsuccess = function(e) {
callback(e.currentTarget.result);
if (typeof callback !== 'undefined' && callback != null) {
callback(e.currentTarget.result);
}
};
request.onerror = designerDB.onerror;
};
designerDB.deleteObject = function(table, id, callback)
{
designerDB.deleteObject = function(table, id, callback) {
var db = datastore;
var transaction = db.transaction([table], 'readwrite');
var objStore = transaction.objectStore(table);
var request = objStore.delete(parseInt(id));
request.onsuccess = function(e) {
callback(true);
if (typeof callback !== 'undefined' && callback != null) {
callback(true);
}
}
request.onerror = function(e) {
console.log(e);
};
request.onerror = designerDB.onerror;
};
designerDB.onerror = function(e) {
console.log(e);
}
// Export the designerDB object.
return designerDB;
}());

18
js/pmd/designer_page.js
View File

@ -56,11 +56,7 @@ function Create_new_page(db, page_name, callback)
function Save_table_positions(positions, callback)
{
DesignerOfflineDB.addObject('table_coords', positions, function (id) {
if (typeof callback !== 'undefined') {
callback(id);
}
});
DesignerOfflineDB.addObject('table_coords', positions, callback);
}
function Create_page_list(callback)
@ -84,22 +80,14 @@ function Delete_page(page_id, callback)
for (i in page.tbl_cords) {
DesignerOfflineDB.deleteObject('table_coords', page.tbl_cords[i]);
}
DesignerOfflineDB.deleteObject('pdf_pages', page_id, function (state) {
if (typeof callback !== 'undefined') {
callback(state);
}
});
DesignerOfflineDB.deleteObject('pdf_pages', page_id, callback);
}
});
}
function Load_first_page(callback)
{
DesignerOfflineDB.loadFirstObject('pdf_pages', function (page) {
if (typeof callback !== 'undefined') {
callback(page);
}
});
DesignerOfflineDB.loadFirstObject('pdf_pages', callback);
}
function Show_new_page_tables(check)

2
js/pmd/move.js
View File

@ -586,7 +586,7 @@ function Save2(callback)
});
} else {
var name = $("#page_name").html().trim();
Save_to_selected_page(db, selected_page, name, Get_url_pos(), function (page){
Save_to_selected_page(db, selected_page, name, Get_url_pos(), function (page) {
if (typeof callback !== 'undefined') {
callback();
}