diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-11-17 15:27:29 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-11-17 15:27:29 +0100 |
| commit | e2fcace05e244bbf65da75680fe62c96eeb58455 (patch) | |
| tree | 738a2b396b4326ff92b2012dd4bc87c97b9ffb68 /addons/web/static/src/js/views/form_widgets.js | |
| parent | 41cebc4637b7aa15fcf25229746bb252f9745d4e (diff) | |
| parent | 13dc7041a6b47bbcc703b855044f41321145c7ab (diff) | |
[MERGE] forward port branch 10.0 up to 13dc704
Diffstat (limited to 'addons/web/static/src/js/views/form_widgets.js')
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 4 |
1 files changed, 2 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 fdd6b071110..d353831ba15 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); |