Skip to content
Snippets Groups Projects

FIX: Save WYSIWYG saving in source mode

Merged Florian Spreckelsen requested to merge f-wysiwyg-source-saving into dev
All threads resolved!
Files
2
@@ -39,6 +39,8 @@
*/
var ext_editmode_wysiwyg_text = function ($, logger, ClassicEditor, edit_mode, getPropertyElements, getPropertyDatatype, getPropertyName) {
var _callOnSave = [];
var insertEditorInProperty = async function (prop) {
if (!(getPropertyDatatype(prop) === 'TEXT')) {
// Ignore anything that isn't a list property, even LIST<TEXT>
@@ -62,7 +64,7 @@ var ext_editmode_wysiwyg_text = function ($, logger, ClassicEditor, edit_mode, g
logger.debug('Initialized editor for ' + getPropertyName(prop));
// Manually implement saving the data since edit mode is not
// a form to be submitted.
editor.model.document.on("change:data", (e) => {
_callOnSave.push(() => {
editor.updateSourceElement();
});
} catch (error) {
@@ -70,7 +72,23 @@ var ext_editmode_wysiwyg_text = function ($, logger, ClassicEditor, edit_mode, g
}
}
const proxySaveMethod = function (original) {
const result = function (entity) {
_callOnSave.forEach(cb => {
cb();
});
if (typeof original === "function") {
return original(entity);
}
return undefined;
}
return result;
}
var replaceTextAreas = function (entity) {
// on save, call callbacks
edit_mode.app.onBeforeInsert = proxySaveMethod(edit_mode.app.onBeforeInsert);
edit_mode.app.onBeforeUpdate = proxySaveMethod(edit_mode.app.onBeforeUpdate);
const properties = getPropertyElements(entity);
for (let prop of properties) {
// TODO(fspreck): This will be replaced by a whitelist of properties
@@ -107,6 +125,12 @@ var ext_editmode_wysiwyg_text = function ($, logger, ClassicEditor, edit_mode, g
logger.debug('Re-rendering ' + getPropertyName(e.target));
ext_editmode_wysiwyg_text.insertEditorInProperty(e.target);
}, true);
// Clear list of saving callbacks when leaving the edit mode (regardless
// of saving or cancelling)
document.body.addEventListener(edit_mode.end_edit.type, (e) => {
this._callOnSave = [];
}, true);
};
return {
Loading