diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-11-30 14:44:49 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-11-30 14:44:49 +0100 |
| commit | 98539336a5d40de748764ff0a3c16d8cda77b02f (patch) | |
| tree | c5b18d5375f4ac458546ff28b29445be9dce0549 /addons/web_editor/static/src | |
| parent | 92f7ecc263ffc252bbec71c9813e12f2933045a2 (diff) | |
| parent | b780e4a0e4389045979fdb82db34e09d4d672cbd (diff) | |
[MERGE] forward port branch saas-14 up to b780e4a0e43
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/backend.js | 4 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/widgets.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js index 7d22186c0a8..f4f8d7144b6 100644 --- a/addons/web_editor/static/src/js/backend.js +++ b/addons/web_editor/static/src/js/backend.js @@ -296,6 +296,8 @@ var FieldTextHtml = widget.extend({ var self = this; this.$el.closest('.modal-body').css('max-height', 'none'); this.$iframe = this.$el.find('iframe'); + // deactivate any button to avoid saving a not ready iframe + $('.o_cp_buttons, .o_statusbar_buttons').find('button').addClass('o_disabled').attr('disabled', true); this.document = null; this.$body = $(); this.$content = $(); @@ -321,6 +323,8 @@ var FieldTextHtml = widget.extend({ this.lang = this.lang ? this.lang[1] : this.view.dataset.context.lang; this._dirty_flag = false; this.render_value(); + // reactivate all the buttons when the field's content (the iframe) is loaded + $('.o_cp_buttons, .o_statusbar_buttons').find('button').removeClass('o_disabled').attr('disabled', false); setTimeout(function () { self.add_button(); setTimeout(self.resize,0); diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js index f924d879e01..d599859cf49 100644 --- a/addons/web_editor/static/src/js/widgets.js +++ b/addons/web_editor/static/src/js/widgets.js @@ -616,7 +616,7 @@ var fontIconsDialog = Widget.extend({ e.stopPropagation(); this.$('#fa-icon').val(e.target.getAttribute('data-id')); - $(".font-icons-icon").removeClass("o_selected"); + this.$(".font-icons-icon").removeClass("o_selected"); $(e.target).addClass("o_selected"); }, 'dblclick .font-icons-icon': function () { @@ -742,7 +742,7 @@ var fontIconsDialog = Widget.extend({ continue; case '': continue; default: - $(".font-icons-icon").removeClass("o_selected").filter("[data-alias*=',"+cls+",']").addClass("o_selected"); + this.$(".font-icons-icon").removeClass("o_selected").filter("[data-alias*=',"+cls+",']").addClass("o_selected"); if (this.alias.indexOf(cls) !== -1) { this.$('#fa-icon').val(cls); } |