summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/website.snippets.editor.js
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2016-01-13 17:13:05 +0100
committerOlivier Dony <odo@openerp.com>2016-01-13 17:13:05 +0100
commit39bd21fc479a85532e1f6368d3fc9d04c8fb2c68 (patch)
treea7dcb9a067e9ba07de11bd5db8c0801019ef96fc /addons/website/static/src/js/website.snippets.editor.js
parent9ad5c66a44d9a0bf67089e3f5e530d8d9fb57491 (diff)
parent3be9d911c0d50cbe6e4e5768d40011849cc43972 (diff)
[MERGE] Forward-port 9.0 up to rev. 3be9d911c0d50cbe6e4e5768d40011849cc43972
Diffstat (limited to 'addons/website/static/src/js/website.snippets.editor.js')
-rw-r--r--addons/website/static/src/js/website.snippets.editor.js6
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;
});
},