composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 15:52:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°9128 - Update CKEditor5 to v48

Browse Source
This commit is contained in:
Stephen Abello
2026-04-21 16:37:45 +02:00
parent 805087a01b
commit 008eb7ae5b
7 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
css/backoffice/components/_quick-create.scss
View File

@@ -247,7 +247,8 @@ $ibo-quick-create--compartment--placeholder-hint--text-color: $ibo-color-grey-70
&:hover { &:hover {
cursor: pointer; cursor: pointer;
@extend a; color: $ibo-hyperlink-color--on-hover;
text-decoration: $ibo-hyperlink-text-decoration--on-hover;
} }
.highlight { .highlight {

5
css/backoffice/vendors/ckeditor/_overloads.scss vendored
View File

@@ -38,8 +38,13 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
--ck-text-small-font-size: #{$ibo-vendors-ckeditor--ck-text-small-font-size}; --ck-text-small-font-size: #{$ibo-vendors-ckeditor--ck-text-small-font-size};
--ck-text-big-font-size: #{$ibo-vendors-ckeditor--ck-text-big-font-size}; --ck-text-big-font-size: #{$ibo-vendors-ckeditor--ck-text-big-font-size};
--ck-text-huge-font-size: #{$ibo-vendors-ckeditor--ck-text-huge-font-size}; --ck-text-huge-font-size: #{$ibo-vendors-ckeditor--ck-text-huge-font-size};
--ck-content-font-size: #{$ibo-font-size-100} !important; /* Important to overload the CKE native rule */
--ck-content-font-family: #{$ibo-font-family-base}, #{$ibo-font-family-fallbacks};
--ck-color-image-caption-text: #{$ibo-vendors-ckeditor--ck-color-image-caption-text}; --ck-color-image-caption-text: #{$ibo-vendors-ckeditor--ck-color-image-caption-text};
--ck-icon-size: 1.3rem;
--ck-ui-component-min-height: 1rem;
} }
/* Base style */ /* Base style */

2
datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.css vendored
View File

File diff suppressed because one or more lines are too long

2
datamodels/2.x/itop-portal-base/portal/public/css/main.css
View File

File diff suppressed because one or more lines are too long

14
datamodels/2.x/itop-portal-base/portal/public/css/portal.css
View File

File diff suppressed because one or more lines are too long

5
js/ckeditor.handler.js
View File

@@ -50,7 +50,10 @@ const CombodoCKEditorHandler = {
this.is_upload_configured[sElem] = false; this.is_upload_configured[sElem] = false;
// create instance // create instance
return this.instances_promise[sElem] = new Promise((resolve, reject) => { return this.instances_promise[sElem] = new Promise((resolve, reject) => {
ClassicEditor.create($(sElem)[0], aConfiguration) ClassicEditor.create(Object.assign({
attachTo: $(sElem)[0],
licenseKey: 'GPL',
}, aConfiguration))
.then(editor => { .then(editor => {
// Adjust size if passed in configuration // Adjust size if passed in configuration
// - Width // - Width

7
sources/Application/Helper/CKEditorHelper.php
View File

@@ -6,15 +6,14 @@ use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
use Combodo\iTop\Application\WebPage\WebPage; use Combodo\iTop\Application\WebPage\WebPage;
use Combodo\iTop\Renderer\BlockRenderer; use Combodo\iTop\Renderer\BlockRenderer;
use Combodo\iTop\Renderer\RenderingOutput; use Combodo\iTop\Renderer\RenderingOutput;
use DBSearch;
use Dict; use Dict;
use DOMSanitizer; use DOMSanitizer;
use Exception; use Exception;
use ExceptionLog; use ExceptionLog;
use UserRights;
use MetaModel; use MetaModel;
use DBSearch; use UserRights;
use utils; use utils;
use appUserPreferences;
/** /**
* Class CKEditorHelper * Class CKEditorHelper
@@ -266,7 +265,7 @@ HTML;
if (file_exists(APPROOT.$sLanguageFileRelPath)) { if (file_exists(APPROOT.$sLanguageFileRelPath)) {
$aJSRelPaths[] = $sLanguageFileRelPath; $aJSRelPaths[] = $sLanguageFileRelPath;
} else { } else {
$sLanguageFileRelPath = 'node_modules/ckeditor5-itop-build/build/translations/'.$sLanguage.'.js'; $sLanguageFileRelPath = 'node_modules/ckeditor5-itop-build/build/translations/'.$sLanguage.'.umd.js';
if (file_exists(APPROOT.$sLanguageFileRelPath)) { if (file_exists(APPROOT.$sLanguageFileRelPath)) {
$aJSRelPaths[] = $sLanguageFileRelPath; $aJSRelPaths[] = $sLanguageFileRelPath;
} }