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

Support clickable links in calendar location

This commit is contained in:
yflory 2022-09-15 17:19:12 +02:00
parent c3b501b431
commit 57c3c28cb0
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,6 +145,12 @@
.tui-full-calendar-icon:not(.tui-full-calendar-calendar-dot):not(.tui-full-calendar-dropdown-arrow):not(.tui-full-calendar-ic-checkbox) {
display: none;
}
.tui-full-calendar-popup-detail-item {
a {
color: @cryptpad_color_link;
text-decoration: underline;
}
}
.tui-full-calendar-section-button-save {
height: 40px;
.btn-primary { // Update button

22
www/calendar/inner.js
View File

@ -348,8 +348,16 @@ define([
},
popupDelete: function() { return Messages.kanban_delete; },
popupDetailLocation: function(schedule) {
// TODO detect url and create 'a' tag
return Messages._getKey('calendar_location', [Util.fixHTML(schedule.location)]);
var l = schedule.location;
var str = Util.fixHTML(l);
delete APP.nextLocationUid;
if (/^https?:\/\//.test(l)) {
var uid = "cp-link-"+Util.uid();
str = `<a href="${l}" id="${uid}">${str}</a>`;
APP.nextLocationUid = uid;
}
return Messages._getKey('calendar_location', [str]);
},
popupIsAllDay: function() { return Messages.calendar_allDay; },
titlePlaceholder: function() { return Messages.calendar_title; },
@ -2108,6 +2116,16 @@ APP.recurrenceRule = {
if (!id) { return; }
if (id.indexOf('|') === -1) { return; } // Original event ID doesn't contain |
if (APP.nextLocationUid) {
var uid = APP.nextLocationUid;
delete APP.nextLocationUid;
var $a = $el.find('#'+uid);
$a.click(function (e) {
e.preventDefault();
e.stopPropagation();
common.openUnsafeURL($a.attr('href'));
});
}
// This is a recurring event, add button to stop recurrence now
var $b = $(h('button.btn.btn-secondary', [
h('i.fa.fa-times'),