From e01837d2f4c683ef976fab0daec9e9afa36bbe82 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 16 Nov 2016 19:01:07 +0100 Subject: [PATCH] [IMP] web: remove monokai in form widget aceEditor Keep return line in ViewMode. Courtesy of @odony --- addons/web/static/src/js/views/form_widgets.js | 4 ++-- addons/web/static/src/less/form_view.less | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index bc649e65cbd..868948c2559 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -1584,8 +1584,8 @@ var AceEditor = common.AbstractField.extend(common.ReinitializeFieldMixin, { if (!window.ace && !this.loadJS_def) { this.loadJS_def = ajax.loadJS('/web/static/lib/ace/ace.odoo-custom.js').then(function () { return $.when(ajax.loadJS('/web/static/lib/ace/mode-python.js'), - ajax.loadJS('/web/static/lib/ace/mode-xml.js'), - ajax.loadJS('/web/static/lib/ace/theme-monokai.js')); + ajax.loadJS('/web/static/lib/ace/mode-xml.js') + ); }); } return $.when(this._super(), this.loadJS_def); diff --git a/addons/web/static/src/less/form_view.less b/addons/web/static/src/less/form_view.less index 7d870122502..22ce69a194f 100644 --- a/addons/web/static/src/less/form_view.less +++ b/addons/web/static/src/less/form_view.less @@ -136,6 +136,11 @@ } } + // ace editor RO + .oe_form_field_text .oe_form_text_content { + white-space: pre-wrap; + } + // Tags .o_form_field_many2manytags { .badge {