diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-01-25 15:41:45 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-01-25 15:41:45 +0100 |
| commit | cb50970f3f88c5e5e4f0608c6d07e66eb4698eb9 (patch) | |
| tree | fae668c499403db72b172b3c8802b869b1040ae7 /addons/web_editor/static | |
| parent | ffaca543c47adf5d0286ff8e9eeb99b193948679 (diff) | |
| parent | eefe879a37aba221bda84adfd880fb7876955920 (diff) | |
[MERGE] forward port branch 11.0 up to eefe879a37a
Diffstat (limited to 'addons/web_editor/static')
| -rw-r--r-- | addons/web_editor/static/src/js/widgets/ace.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/widgets/ace.js b/addons/web_editor/static/src/js/widgets/ace.js index 2112468fa95..80bb28a4c01 100644 --- a/addons/web_editor/static/src/js/widgets/ace.js +++ b/addons/web_editor/static/src/js/widgets/ace.js @@ -192,7 +192,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'); @@ -210,6 +209,7 @@ var ViewEditor = Widget.extend({ 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; |
