The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

#1171: Rename description with body

Browse Source 
* Rename description in the schedule object
  -> Use the body property of [tui-calendar](https://github.com/nhn/tui.calendar/)
  for to show the description in the details popup :
  <https://github.com/nhn/tui.calendar/blob/main/docs/en/apis/template.md#popupdetailbody>
This commit is contained in:
Fabrice Mouhartem 2023-10-19 11:42:21 +02:00 committed by Fabrice Mouhartem
parent 398df9d58f
commit 7ceca7d4af
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/calendar/app-calendar.less
View File

@ -211,10 +211,10 @@
.tui-full-calendar-section-date-dash {
height: auto;
}
.tui-full-calendar-section-title, .tui-full-calendar-section-location, .tui-full-calendar-section-description {
.tui-full-calendar-section-title, .tui-full-calendar-section-location, .tui-full-calendar-section-body {
width: 100%;
}
.tui-full-calendar-section-description textarea {
.tui-full-calendar-section-body textarea {
width: 100%;
height: 200px;
}

8
www/calendar/export.js
View File

@ -106,7 +106,7 @@ define([
var escapeValue = function(str) {
return str.replace(/\n/g, ["\\n"]);
}
};
Array.prototype.push.apply(arr, [
'BEGIN:VEVENT',
@ -118,7 +118,7 @@ define([
rrule,
'SUMMARY:'+ data.title,
'LOCATION:'+ data.location,
'DESCRIPTION:' + escapeValue(data.description),
'DESCRIPTION:' + escapeValue(data.body),
].filter(Boolean));
if (Array.isArray(data.reminders)) {
@ -314,7 +314,7 @@ define([
}
// Store other properties
var used = ['dtstart', 'dtend', 'uid', 'summary', 'location', 'dtstamp', 'rrule', 'recurrence-id'];
var used = ['dtstart', 'dtend', 'uid', 'summary', 'location', 'description', 'dtstamp', 'rrule', 'recurrence-id'];
var hidden = [];
ev.getAllProperties().forEach(function (p) {
if (used.indexOf(p.name) !== -1) { return; }
@ -359,7 +359,7 @@ define([
category: 'time',
title: ev.getFirstPropertyValue('summary'),
location: ev.getFirstPropertyValue('location'),
description: ev.getFirstPropertyValue('description'),
body: ev.getFirstPropertyValue('description'),
isAllDay: isAllDay,
start: start,
end: end,

47
www/calendar/inner.js
View File

@ -285,7 +285,7 @@ define([
var obj = data.content[uid];
obj.title = obj.title || "";
obj.location = obj.location || "";
obj.description = obj.description || "";
obj.body = obj.body || "";
if (obj.isAllDay && obj.startDay) { obj.start = +Flatpickr.parseDate((obj.startDay)); }
if (obj.isAllDay && obj.endDay) {
var endDate = Flatpickr.parseDate(obj.endDay);
@ -391,6 +391,13 @@ define([
return Messages._getKey('calendar_location', [str]);
},
popupDetailBody: function(schedule) {
var d = schedule.body;
var str = Util.fixHTML(d);
str = str.replace(/(?:\r\n|\r|\n)/g, '<br />');
delete APP.body;
return 'Description:<br />' + str;
},
popupIsAllDay: function() { return Messages.calendar_allDay; },
titlePlaceholder: function() { return Messages.calendar_title; },
locationPlaceholder: function() { return Messages.calendar_loc; },
@ -1027,8 +1034,8 @@ ICS ==> create a new event with the same UID and a RECURRENCE-ID field (with a v
changes.recurrenceRule = rec;
}
var description = APP.description;
changes.description = description;
var body = APP.body;
changes.body = body;
}
@ -2013,37 +2020,37 @@ APP.recurrenceRule = {
]);
};
var getDescriptionInput = function() {
var getBodyInput = function() {
var ev = APP.editModalData;
var calId = ev.selectedCal.id;
// DEFAULT HERE [10] ==> 10 minutes before the event
var id = (ev.id && ev.id.split('|')[0]) || undefined;
var _ev = APP.calendar.getSchedule(ev.id, calId);
var oldDescription = _ev && _ev.raw && _ev.raw.description;
if (!oldDescription) {
oldDescription = Util.find(APP.calendars, [calId, 'content', 'content', id, 'description']) || "";
var oldBody = _ev && _ev.raw && _ev.raw.body;
if (!oldBody) {
oldBody = Util.find(APP.calendars, [calId, 'content', 'content', id, 'body']) || "";
}
APP.description = oldDescription;
var description = h('textarea.tui-full-calendar-content', {
APP.body = oldBody;
var body = h('textarea.tui-full-calendar-content', {
placeholder: 'Description', // TODO: replace with Message.calendar_description
id: 'tui-full-calendar-description',
id: 'tui-full-calendar-body',
});
description.value = oldDescription;
body.value = oldBody;
var updateDescription = function(value) {
APP.description = value;
var updateBody = function(value) {
APP.body = value;
};
var $description = $(description);
$description.on('input', function() {
updateDescription(description.value);
var $body = $(body);
$body.on('input', function() {
updateBody(body.value);
});
return h('div.tui-full-calendar-popup-section.tui-full-calendar-vlayout-area', [
h('div.tui-full-calendar-popup-section-item.tui-full-calendar-section-description', [
description,
h('div.tui-full-calendar-popup-section-item.tui-full-calendar-section-body', [
body,
]),
]);
};
@ -2158,8 +2165,8 @@ APP.recurrenceRule = {
var div = getNotificationDropdown();
$button.before(div);
var descriptionInput = getDescriptionInput();
$startDate.parent().parent().before(descriptionInput);
var bodyInput = getBodyInput();
$startDate.parent().parent().before(bodyInput);
// Use Flatpickr with or without time depending on allday checkbox
var $cbox = $el.find('#tui-full-calendar-schedule-allday');