diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-07-30 20:30:14 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-07-30 20:30:14 +0200 |
| commit | e4cb5202a056ba0ad666af0268861e672a2cdab3 (patch) | |
| tree | 7ffadb844202eaa8a4e3c6c9460b4a534ea34438 /addons/website/static/src/js/website.editor.js | |
| parent | 23436ca25943037a01a1ff435e05aaa32a9ffed3 (diff) | |
| parent | fa07bc85329d825107f332053cecd2a51771823c (diff) | |
[MERGE] forward port of branch saas-4 up to fa07bc8
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index c3c016b3ef2..cba6edf9c67 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -552,7 +552,13 @@ observer.disconnect(); var editor = this.rte.editor; var root = editor.element && editor.element.$; - editor.destroy(); + try { + editor.destroy(); + } + catch(err) { + // Hack to avoid the lost of all changes because ckeditor fails in destroy + console.log("Error in editor.destroy() : " + err.toString() + "\n " + err.stack); + } // FIXME: select editables then filter by dirty? var defs = this.rte.fetch_editables(root) .filter('.oe_dirty') |