web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix redraw ownership modal in drive

Browse Source
This commit is contained in:
yflory 2019-09-03 13:45:32 +02:00
parent 32f1d1627f
commit c4dcfc9ccf
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
www/common/common-ui-elements.js
View File

@ -111,7 +111,7 @@ define([
// Remove owner column // Remove owner column
var drawRemove = function (pending) { var drawRemove = function (pending) {
var _owners = {}; var _owners = {};
var o = pending ? pending_owners : owners; var o = (pending ? pending_owners : owners) || [];
o.forEach(function (ed) { o.forEach(function (ed) {
var f; var f;
Object.keys(friends).some(function (c) { Object.keys(friends).some(function (c) {
@ -189,6 +189,7 @@ define([
err = err || (res && res.error); err = err || (res && res.error);
if (err) { if (err) {
waitFor.abort(); waitFor.abort();
redrawAll();
return void UI.warn('ERROR' + err); return void UI.warn('ERROR' + err);
} // XXX } // XXX
UI.log('DONE'); // XXX UI.log('DONE'); // XXX
@ -280,6 +281,7 @@ define([
err = err || (res && res.error); err = err || (res && res.error);
if (err) { if (err) {
waitFor.abort(); waitFor.abort();
redrawAll();
return void UI.warn('ERROR' + err); return void UI.warn('ERROR' + err);
} // XXX } // XXX
})); }));
@ -318,7 +320,9 @@ define([
redrawAll = function () { redrawAll = function () {
if (pending) { return; } if (pending) { return; }
pending = true; pending = true;
common.getPadMetadata(null, function (obj) { common.getPadMetadata({
channel: data.channel
}, function (obj) {
pending = false; pending = false;
if (obj && obj.error) { return; } if (obj && obj.error) { return; }
owners = obj.owners; owners = obj.owners;

1
www/drive/inner.js
View File

@ -3719,7 +3719,6 @@ define([
sframeChan.query('Q_GET_PAD_METADATA', { sframeChan.query('Q_GET_PAD_METADATA', {
channel: data.channel channel: data.channel
}, function (err, val) { }, function (err, val) {
console.log(arguments);
if (!err && !(val && val.error)) { if (!err && !(val && val.error)) {
data.owners = val.owners; data.owners = val.owners;
data.expire = val.expire; data.expire = val.expire;