mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-12 23:14:18 +01:00
N°5298 - Fix CKEditor not using width/height from the datamodel since upgrade to v5 in the backoffice
This commit is contained in:
@@ -81,7 +81,6 @@ class UIHTMLEditorWidget
|
||||
if ($sWidthSpec != '') {
|
||||
/*N°6543 - the function min allow to keep text inside the column when width is defined*/
|
||||
$aConfig['width'] = "min($sWidthSpec,100%)";
|
||||
$sJSDefineWidth = '$("#cke_'.$iId.' iframe").contents().find("body").css("width", "'.$sWidthSpec.'")';
|
||||
}
|
||||
$sHeightSpec = addslashes(trim($this->m_oAttDef->GetHeight()));
|
||||
if ($sHeightSpec != '') {
|
||||
|
||||
@@ -49,6 +49,16 @@ const CombodoCKEditorHandler = {
|
||||
return this.instances_promise[sElem] = new Promise((resolve, reject) => {
|
||||
ClassicEditor.create($(sElem)[0], aConfiguration)
|
||||
.then(editor => {
|
||||
// Adjust size if passed in configuration
|
||||
// - Width
|
||||
if (aConfiguration.width !== undefined) {
|
||||
editor.editing.view.change( writer => { writer.setStyle( 'width', aConfiguration.width, editor.editing.view.document.getRoot() ); } );
|
||||
}
|
||||
// - Height
|
||||
if (aConfiguration.height !== undefined) {
|
||||
editor.editing.view.change( writer => { writer.setStyle( 'height', aConfiguration.height, editor.editing.view.document.getRoot() ); } );
|
||||
}
|
||||
|
||||
this.instances[sElem] = editor;
|
||||
resolve(editor);
|
||||
})
|
||||
|
||||
@@ -61,18 +61,18 @@ class CKEditorHelper
|
||||
*/
|
||||
static public function GetCkeditorPref()
|
||||
{
|
||||
// extract language from user preferences
|
||||
// Extract language from user preferences
|
||||
$sLanguageCountry = trim(UserRights::GetUserLanguage());
|
||||
$sLanguage = strtolower(explode(' ', $sLanguageCountry)[0]);
|
||||
|
||||
$aDefaultConf = array(
|
||||
'language'=> $sLanguage,
|
||||
'language' => $sLanguage,
|
||||
);
|
||||
|
||||
// mentions
|
||||
// Mentions
|
||||
$aDefaultConf['mention'] = self::GetMentionConfiguration();
|
||||
|
||||
// rich text config
|
||||
// Rich text config
|
||||
$aRichTextConfig = json_decode(appUserPreferences::GetPref('richtext_config', '{}'), true);
|
||||
|
||||
return array_merge($aDefaultConf, $aRichTextConfig);
|
||||
|
||||
Reference in New Issue
Block a user