Fixed backup bugs with deleted pads.
This commit is contained in:
@@ -187,7 +187,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (var pad in pads) {
|
for (var pad in pads) {
|
||||||
addPadList(pads[pad]);
|
if (pads[pad] != null) {
|
||||||
|
addPadList(pads[pad]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$("#searchtext").attr("data-source", JSON.stringify(pads));
|
$("#searchtext").attr("data-source", JSON.stringify(pads));
|
||||||
}
|
}
|
||||||
@@ -219,18 +221,27 @@
|
|||||||
getKVSItem(hashTitle(pads[pad]), function(data) {
|
getKVSItem(hashTitle(pads[pad]), function(data) {
|
||||||
backup[pads[pad]] = sjcl.decrypt(key, data);
|
backup[pads[pad]] = sjcl.decrypt(key, data);
|
||||||
backupWaiting--;
|
backupWaiting--;
|
||||||
if (backupWaiting == 0) {
|
doShowBackupDlg();
|
||||||
$("#backupDlg").modal();
|
|
||||||
$("#backupText").val(JSON.stringify(backup))
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function doShowBackupDlg() {
|
||||||
|
if (backupWaiting == 0) {
|
||||||
|
$("#backupDlg").modal();
|
||||||
|
$("#backupText").val(JSON.stringify(backup))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function doBackup() {
|
function doBackup() {
|
||||||
backup = new Object();
|
backup = new Object();
|
||||||
backupWaiting = pads.length;
|
backupWaiting = pads.length;
|
||||||
for (var pad in pads) {
|
for (var pad = 0; pad < pads.length; pad++) {
|
||||||
backupKVS(pad);
|
if ((pads[pad] == null) || (typeof pads[pad] === 'undefined')) {
|
||||||
|
backupWaiting--;
|
||||||
|
doShowBackupDlg();
|
||||||
|
} else {
|
||||||
|
backupKVS(pad);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user