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

Merge branch '2025.6-rc' into staging

Browse Source
This commit is contained in:
yflory 2025-07-09 10:44:58 +02:00
commit ecdce7e1e9
7 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,13 +171,17 @@
color: @cryptpad_text_col;
border-radius: @variables_radius_L;
font-weight: normal;
.tui-full-calendar-icon:not(.tui-full-calendar-calendar-dot):not(.tui-full-calendar-dropdown-arrow):not(.tui-full-calendar-ic-checkbox):not(.fa-map-marker):not(.fa-align-justify) {
.tui-full-calendar-icon:not(.tui-full-calendar-calendar-dot):not(.tui-full-calendar-dropdown-arrow):not(.tui-full-calendar-ic-checkbox):not(.fa-map-marker):not(.fa-align-left) {
display: none;
}
.tui-full-calendar-icon {
text-align:center;
flex-shrink: 0;
}
.tui-full-calendar-calendar-dot {
margin-right: 10px;
top: 0;
}
.tui-full-calendar-popup-detail-item {
display: flex;
margin-bottom: 0.3rem;
@ -186,8 +190,8 @@
display: flex;
align-items: center;
}
.fa-align-justify {
margin-top: 3px;
.fa-align-left {
margin-top: 4px;
}
&.tui-full-calendar-popup-detail-item-separate {
&>span {
@ -203,7 +207,6 @@
}
}
a {
margin:0.1rem;
border-radius: @variables_radius;
color: @cryptpad_color_link;
text-decoration: underline;
@ -321,6 +324,9 @@
font-size: inherit;
line-height: inherit;
}
* {
box-sizing: content-box;
}
}
.CodeMirror-placeholder {
color: @cp_forms-placeholder;

19
www/calendar/inner.js
View File

@ -415,7 +415,7 @@ define([
var str = schedule.body;
delete APP.eventBody;
let description_icon = h('i.fa.fa-align-justify.tui-full-calendar-icon', { 'aria-hidden': true }, []);
let description_icon = h('i.fa.fa-align-left.tui-full-calendar-icon', { 'aria-hidden': true }, []);
let description = diffMk.render(str, true);
return `${description_icon.outerHTML}<div class="event-description">${description}</div>`;
},
@ -2393,6 +2393,23 @@ APP.recurrenceRule = {
});
}
var privateData = metadataMgr.getPrivateData();
$el.find('.event-description').click(e => {
if (!e.target) { return; }
var $t = $(e.target);
if (!$t.is('a') && !$t.parents('a').length) { return; }
e.preventDefault();
var $a = $t.is('a') ? $t : $t.parents('a').first();
var href = $a.attr('href');
if (/^#/.test(href)) { return; }
if (/^\/[^\/]/.test(href)) {
href = privateData.origin + href;
return void common.openURL(href);
}
common.openUnsafeURL(href);
});
console.error($el.find('.event-description'), $el);
var $section = $el.find('.tui-full-calendar-section-button');
var ev = APP.editModalData;
var data = ev.schedule || {};

5
www/common/cryptpad-common.js
View File

@ -80,7 +80,9 @@ define([
var keys = [];
nThen(function (waitFor) {
// Not logged in? check for temp RPC keys
if (!LocalStore.isLoggedIn() && Env?.returned?.tempKeys) {
const anon = !LocalStore.isLoggedIn()
|| common.neverDrive;
if (anon && Env?.returned?.tempKeys) {
keys.push(Env.returned.tempKeys);
return;
}
@ -2672,6 +2674,7 @@ define([
Messages,
AppConfig
};
common.neverDrive = rdyCfg.neverDrive;
common.userHash = userHash || LocalStore.getUserHash();
// FIXME Backward compatibility

2
www/common/onlyoffice/inner.js
View File

@ -2159,7 +2159,7 @@ define([
url: url,
permissions: {
download: dc?.permissions?.download || false,
print: dc?.permissions?.print || true,
print: dc?.permissions?.print !== false,
protect: file.type === 'xlsx',
}
},

4
www/common/sframe-app-framework.js
View File

@ -670,6 +670,10 @@ define([
UI.removeLoadingScreen(emitResize);
if (integrationChannel) {
integrationChannel.event('EV_INTEGRATION_READY');
}
if (AppConfig.textAnalyzer && textContentGetter) {
AppConfig.textAnalyzer(textContentGetter, privateDat.channel);
}

8
www/diagram/inner.js
View File

@ -63,9 +63,11 @@ define([
var onDrawioInit = function() {
drawIoInitalized = true;
var readOnly = framework.isReadOnly() || framework.isLocked();
var grid = readOnly ? 0 : 1;
lastContent.mxfile.diagram.mxGraphModel._grid = grid;
if (lastContent?.mxfile?.diagram?.mxGraphModel) {
let readOnly = framework.isReadOnly() || framework.isLocked();
let grid = readOnly ? 0 : 1;
lastContent.mxfile.diagram.mxGraphModel._grid = grid;
}
var xmlStr = DiagramUtil.jsonContentAsXML(lastContent);
postMessageToDrawio({
action: 'load',

3
www/settings/app-settings.less
View File

@ -333,6 +333,9 @@
font-size: inherit;
line-height: inherit;
}
* {
box-sizing: content-box;
}
}
.cp-markdown-toggle-button {
.markdown-toolbar-button-style();