mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-17 14:28:53 +02:00
Merge branch 'support/3.2' into develop
# Conflicts: # css/setup.css # datamodels/2.x/itop-portal-base/portal/public/css/portal.css # package-lock.json
This commit is contained in:
@@ -50,7 +50,10 @@ const CombodoCKEditorHandler = {
|
||||
this.is_upload_configured[sElem] = false;
|
||||
// create instance
|
||||
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 => {
|
||||
// Adjust size if passed in configuration
|
||||
// - Width
|
||||
|
||||
Reference in New Issue
Block a user