blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1306: Cleaning up the code

Browse source 
- Put special cases at the beginning of the conditional branching
This commit is contained in:
Fabrice Mouhartem 2023-11-09 17:10:31 +01:00
parent 36499846c9
commit bcf33060f8
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
www/common/outer/calendar.js
View file

@ -893,18 +893,16 @@ define([
// Update recurrence rule. We may create a new event here
var dontSendUpdate = false;
if (typeof(changes.recurrenceRule) !== "undefined") {
if (type.which === "from" && !data.rawData.isOrigin) {
// Clean from the day after the event (it otherwise wipes too much)
cleanAfter(type.when + 86400000);
if (type.which === "all" && changes.recurrenceRule.until) {
// Remove changes after the last iteration
cleanAfter(changes.recurrenceRule.until);
}
else if (['one','from'].includes(type.which) && !data.rawData.isOrigin) {
// Start cleaning after the event (otherwise it resets the current event)
cleanAfter(type.when + 1);
} else {
if (changes.recurrenceRule.until) {
// Remove changes after the last iteration
cleanAfter(changes.recurrenceRule.until);
}
if (changes.recurrenceRule === "") {
// Reset special cases when removing recurrence
update = ev.recUpdate = RECUPDATE;
}
// Else wipe everything
update = ev.recUpdate = RECUPDATE;
}
}