dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1171: Render markdown with diffMK for details popup 

* Sanitized markdown raises a warning:
```
marked(): sanitize and sanitizer parameters are deprecated since version
          0.7.0, should not be used and will be removed in the future.
            Read more here:
          https://marked.js.org/#/USING_ADVANCED.md#options
          marked.min.js:6:44783
```
This commit is contained in:
Fabrice Mouhartem 2023-10-19 17:48:16 +02:00 committed by Fabrice Mouhartem
parent d61b8376cc
commit 8c3c3d8d51
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
www/calendar/inner.js
View File

@ -24,6 +24,8 @@ define([
'/common/inner/access.js',
'/common/inner/properties.js',
'/common/diffMarked.js',
'/common/jscolor.js',
'/components/file-saver/FileSaver.min.js',
'css!/lib/calendar/tui-calendar.min.css',
@ -51,7 +53,8 @@ define([
Export,
Rec,
Flatpickr,
Share, Access, Properties
Share, Access, Properties,
diffMk,
)
{
Messages.calendar_rec_change_first = "You moved the first repeating event to different calendar. You can only apply this change to all repeated events."; // XXX New translation key
@ -392,11 +395,9 @@ 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 />');
var str = schedule.body;
delete APP.body;
return 'Description:<br />' + str;
return 'Description:<br />' + diffMk.render(str,true);
},
popupIsAllDay: function() { return Messages.calendar_allDay; },
titlePlaceholder: function() { return Messages.calendar_title; },