diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:24:04 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:24:04 +0100 |
| commit | 78d20b552b4374b94aec7097c0e6a48a3dd2d961 (patch) | |
| tree | 5acd7cbf1cc9e2f277034f44fc0ebebaa3a1a79c /addons/website/static/src/js | |
| parent | 740a6eadd379cc3fa26aefb9350f1c95b3e05ebd (diff) | |
| parent | 7e44ddcda3f21c7e6401173539dc0fe93f9a7dd2 (diff) | |
[MERGE] forward port of branch saas-8 up to 7e44ddc
Diffstat (limited to 'addons/website/static/src/js')
| -rw-r--r-- | addons/website/static/src/js/website.snippets.editor.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index 6015f740301..0da262f145e 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -326,7 +326,9 @@ options.registry.marginAndResize = options.Class.extend({ $body.removeClass(cursor); setTimeout(function () { self.buildingBlock.editor_busy = false; - self.$target.closest(".o_editable").trigger("content_changed"); + if (begin !== current) { + self.buildingBlock.parent.rte.historyRecordUndo(self.$target, 'resize_' + XY); + } },0); self.$target.removeClass("resize_editor_busy"); }; @@ -336,8 +338,8 @@ options.registry.marginAndResize = options.Class.extend({ this.$overlay.find(".oe_handle.size .auto_size").on('click', function (event){ self.$target.css("height", ""); self.$target.css("overflow", ""); + self.buildingBlock.parent.rte.historyRecordUndo(self.$target, 'resize_Y'); self.buildingBlock.cover_target(self.$overlay, self.$target); - self.$target.closest(".o_editable").trigger("content_changed"); return false; }); }, |