summaryrefslogtreecommitdiff
path: root/addons/web_editor/static
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-01-24 18:12:53 +0100
committerChristophe Simonis <chs@odoo.com>2018-01-24 18:12:53 +0100
commit0c97be858c9e4eb149dd8439da2fc9ce223d794b (patch)
treede369b87e08a349b5faf77d91768d0004b1cc1bf /addons/web_editor/static
parent50d87ae81b09fe9f621893eee8ccde4367e46c79 (diff)
parent4ea4f99df99e0f8d6e01b3116020cd1b525ec1fd (diff)
[MERGE] forward port branch saas-14 up to 4ea4f99df99
Diffstat (limited to 'addons/web_editor/static')
-rw-r--r--addons/web_editor/static/src/js/ace.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/ace.js b/addons/web_editor/static/src/js/ace.js
index 45a8214c255..b8544774fdb 100644
--- a/addons/web_editor/static/src/js/ace.js
+++ b/addons/web_editor/static/src/js/ace.js
@@ -167,7 +167,6 @@ var ViewEditor = Widget.extend({
*/
start: function () {
this.$viewEditor = this.$("#ace-view-editor");
- this.$editor = this.$(".ace_editor");
this.$typeSwitcherChoices = this.$(".o_ace_type_switcher_choice");
this.$typeSwitcherBtn = this.$(".o_ace_type_switcher > .dropdown-toggle");
@@ -182,9 +181,9 @@ var ViewEditor = Widget.extend({
this.$formatButton = this.$("button[data-action=\"format\"]");
this.$resetButton = this.$("button[data-action=\"reset\"]");
-
this.aceEditor = window.ace.edit(this.$viewEditor[0]);
this.aceEditor.setTheme("ace/theme/monokai");
+ this.$editor = this.$(".ace_editor");
var refX = 0;
var resizing = false;