Commit 24aa9dd7 authored by Rafael Monnerat's avatar Rafael Monnerat

erp5_json_editor: Disable ajax and catch promise

See merge request !1858
parents ebf18760 a697da76
......@@ -152,12 +152,12 @@
JSONEditor.defaults.editors.string.prototype.setValueToInputField = function (value) {
this.input.value = value === undefined ? '' : value;
/* ERP5: Once you set the value to the input, you also
/* ERP5: Once you set the value to the input, you also
updates the field value, otherwise the getValue will miss the value */
this.value = this.input.value;
};
/* Backward compatibility with the usage of textarea property
/* Backward compatibility with the usage of textarea property
if converts into json-editor proper property */
JSONEditor.defaults.editors.string.prototype.preBuild = function () {
if ((this.schema.textarea === true) || (this.schema.textarea === 1)) {
......@@ -188,7 +188,7 @@
}
// Ignore the first attempt since editor trigger change on the after the
// end of the rendering, so ignore the first attempt is reaquired.
// Later calls that trigger change
// Later calls that trigger change
gadget.state.ignoredChangeDuringInitialization = false;
}
......@@ -221,7 +221,7 @@
.push(function (schema) {
return new JSONEditor(domsugar(json_editor_container), {
schema: schema,
ajax: true,
ajax: false,
theme: 'bootstrap5',
show_errors: 'always',
//iconlib: 'fontawesome5',
......@@ -245,11 +245,11 @@
gadget.editor = editor;
gadget.editor.on('change', gadget.deferNotifyChangeBinded.bind(gadget));
// return complex object is not possible throught iframe
// it seems to crash rjs somewhere. To check...
// https://lab.nexedi.com/nexedi/renderjs/blob/master/renderjs.js#L2070
//return editor;
});
// editor relies on async load function, so we must return the promise
// to finish before continue, otherwise rendering errors wont throw Errors
// in the same stack as expected.
return editor.promise
})
})
.declareMethod('getContent', function () {
var form_data = {};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment