infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Calendar deletion

pull/1/head
yflory 2021-04-06 10:37:31 +02:00
parent 15d582e810
commit af1d0e3082
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/calendar/inner.js
View File

@ -163,8 +163,13 @@ Messages.calendar_today = "Today";
// Is it a new calendar?
var isNew = !APP.calendars[data.id];
// Update local data
APP.calendars[data.id] = data;
if (data.deleted) {
// Remove this calendar
delete APP.calendars[data.id];
} else {
// Update local data
APP.calendars[data.id] = data;
}
// If calendar if initialized, update it
if (!cal) { return; }

19
www/common/outer/calendar.js
View File

@ -94,6 +94,7 @@ ctx.calendars[channel] = {
teams: c.stores,
id: c.channel,
readOnly: c.readOnly,
deleted: !c.stores.length,
content: Util.clone(c.proxy)
}, ctx.clients);
};
@ -274,7 +275,6 @@ ctx.calendars[channel] = {
});
};
var updateCalendar = function (ctx, data, cId, cb) {
console.error(data);
var id = data.id;
var c = ctx.calendars[id];
if (!c) { return void cb({error: "ENOENT"}); }
@ -303,7 +303,22 @@ ctx.calendars[channel] = {
console.error(res.error);
}
});
ctx.Store.onSync(store.id, cb);
var ctxCal = ctx.calendars[id];
var idx = ctxCal.stores.indexOf(store.id || 1);
// Remove this store from the calendar's clients
ctxCal.stores.splice(idx, 1);
if (!ctxCal.stores.length) {
// If the calendar doesn't exist in any other team, stop it and delete it
// from ctx
ctxCal.lm.stop();
delete ctx.calendars[id];
}
ctx.Store.onSync(store.id, function () {
sendUpdate(ctx, ctxCal);
cb();
});
// XXX broadcast to inner
};
// XXX when we destroy a calendar, make sure we also delete it