mirror_html/nullboard
1
0
Fork 0
mirror of https://github.com/apankrat/nullboard.git synced 2025-08-13 16:44:43 +02:00
Code Issues Projects Releases Wiki Activity

change BackupStorage.checkStatus to re-use put/config

Browse Source
This commit is contained in:
Alex Pankratov
2021-04-22 16:32:02 +02:00
parent f5c23e6a68
commit 9923868e56
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
nullboard.html
View File

@@ -1418,8 +1418,8 @@
} }
/***/ /***/
.theme-dark textarea, .theme-dark .wrap textarea,
.theme-dark input { .theme-dark .wrap input {
background: #111315; background: #111315;
color: #eee; color: #eee;
} }
@@ -1976,7 +1976,7 @@
meta.current = revision; meta.current = revision;
backupBoard(board_id, null, meta); this.backupBoard(board_id, null, meta);
return this.setJson('board.' + board_id + '.meta', meta) && return this.setJson('board.' + board_id + '.meta', meta) &&
this.setJson('board.' + board_id, revision); // for older versions this.setJson('board.' + board_id, revision); // for older versions
@@ -2411,12 +2411,17 @@
checkStatus(cb) checkStatus(cb)
{ {
var self = this; var self = this;
var test = new Image;
$.ajax({ $.ajax({
url: this.conf.base + '/test', url: this.conf.base + '/config',
type: 'put', type: 'put',
headers: { 'X-Access-Token': this.conf.auth }, headers: { 'X-Access-Token': this.conf.auth },
data:
{
self: document.location.href,
// conf: -- without the data --
},
dataType: 'json'
}) })
.done(function(d, s, x) { if (cb) cb.call(self, true, x, s, d); }) .done(function(d, s, x) { if (cb) cb.call(self, true, x, s, d); })
.fail(function(x, s, e) { if (cb) cb.call(self, false, self.patchXhr(x), s, e); }) .fail(function(x, s, e) { if (cb) cb.call(self, false, self.patchXhr(x), s, e); })
@@ -2430,7 +2435,12 @@
url: this.conf.base + '/config', url: this.conf.base + '/config',
type: 'put', type: 'put',
headers: { 'X-Access-Token': this.conf.auth }, headers: { 'X-Access-Token': this.conf.auth },
data: JSON.stringify(conf), data:
{
self: document.location.href,
conf: JSON.stringify(conf)
},
dataType: 'json'
}) })
.done(function(d, s, x) { if (cb) cb.call(self, true, x, s, d); }) .done(function(d, s, x) { if (cb) cb.call(self, true, x, s, d); })
.fail(function(x, s, e) { if (cb) cb.call(self, false, self.patchXhr(x), s, e); }) .fail(function(x, s, e) { if (cb) cb.call(self, false, self.patchXhr(x), s, e); })
@@ -2446,10 +2456,11 @@
headers: { 'X-Access-Token': this.conf.auth }, headers: { 'X-Access-Token': this.conf.auth },
data: data:
{ {
self: document.location.href,
data: data ? JSON.stringify(data) : null, data: data ? JSON.stringify(data) : null,
meta: meta ? JSON.stringify(meta) : null meta: meta ? JSON.stringify(meta) : null
}, },
dataType: 'json', dataType: 'json'
}) })
.done(function(d, s, x) { if (cb) cb.call(self, true, x, s, d); }) .done(function(d, s, x) { if (cb) cb.call(self, true, x, s, d); })
.fail(function(x, s, e) { if (cb) cb.call(self, false, self.patchXhr(x), s, e); }) .fail(function(x, s, e) { if (cb) cb.call(self, false, self.patchXhr(x), s, e); })
@@ -3115,7 +3126,7 @@
function saveBoard() function saveBoard()
{ {
var $board = $('.wrap .board'); var $board = $('.wrap .board');
var board = jsonClone(NB.board); // id, revision & title var board = Object.assign(new Board(), NB.board); // id, revision & title
board.lists = []; board.lists = [];
@@ -3669,6 +3680,10 @@
if (status == 'failed') $config.addClass('backup-err').removeClass('backing-up'); else if (status == 'failed') $config.addClass('backup-err').removeClass('backing-up'); else
if (status == 'busy') $config.addClass('backing-up').removeClass('backup-err'); else if (status == 'busy') $config.addClass('backing-up').removeClass('backup-err'); else
if (status == 'ok') $config.removeClass('backing-up backup-err'); if (status == 'ok') $config.removeClass('backing-up backup-err');
// if become 'ok' - process all pending backups
// ...
} }
/* /*