Commit f7070f8b authored by Romain Courteaud's avatar Romain Courteaud

erp5_core: force using the html_viewer in more cases

parent b4907bad
...@@ -65,6 +65,13 @@ ...@@ -65,6 +65,13 @@
// as user may have modified the input value // as user may have modified the input value
render_timestamp: new Date().getTime() render_timestamp: new Date().getTime()
}; };
if ((!state_dict.editable) &&
((state_dict.editor === 'fck_editor') ||
(state_dict.content_type === 'text/html') ||
(!state_dict.content_type))) {
state_dict.editor = 'html_viewer';
}
return this.changeState(state_dict); return this.changeState(state_dict);
}) })
...@@ -135,7 +142,8 @@ ...@@ -135,7 +142,8 @@
); );
}); });
} else if (!gadget.state.editable && } else if (!gadget.state.editable &&
(gadget.state.editor === 'fck_editor')) { ((gadget.state.editor === 'fck_editor') ||
(gadget.state.editor === 'html_viewer'))) {
queue queue
.push(function () { .push(function () {
return gadget.declareGadget(editor_dict.html_viewer.url, { return gadget.declareGadget(editor_dict.html_viewer.url, {
...@@ -157,6 +165,7 @@ ...@@ -157,6 +165,7 @@
if ((gadget.state.editable && if ((gadget.state.editable &&
(editor_dict.hasOwnProperty(gadget.state.editor))) || (editor_dict.hasOwnProperty(gadget.state.editor))) ||
(gadget.state.editor === 'fck_editor') || (gadget.state.editor === 'fck_editor') ||
(gadget.state.editor === 'html_viewer') ||
(!gadget.state.editable && gadget.state.editor === 'jsmd_editor') || (!gadget.state.editable && gadget.state.editor === 'jsmd_editor') ||
(!gadget.state.editable && gadget.state.editor === 'monaco') || (!gadget.state.editable && gadget.state.editor === 'monaco') ||
(gadget.state.editor === 'pdf')) { (gadget.state.editor === 'pdf')) {
......
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