summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-02-14 16:34:13 +0100
committerChristophe Simonis <chs@odoo.com>2018-02-14 16:34:13 +0100
commitd24bdbde81be971be27e39ef7a2e1a1b2371074e (patch)
tree5c1cc64cf0fadcf1879ef10f233a3793c47b6bfb /addons/website/static/src
parent33e7c8d60c58c98d2f679b66abae5af7ef224726 (diff)
parent9d0de6111471860bc541058be351df4abb8ea167 (diff)
[MERGE] forward port branch saas-14 up to 9d0de611147
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/website.snippets.editor.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 339c7437afe..a1082890137 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -263,9 +263,13 @@ options.registry["margin-x"] = options.registry.marginAndResize.extend({
return this.grid;
},
- on_clone: function ($clone) {
- var _class = $clone.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-)([0-9-]+)/g, '');
- $clone.attr("class", _class);
+ on_clone: function ($clone, options) {
+ // Below condition is added to remove offset of target element only
+ // and not its children to avoid design alteration of a container / block.
+ if (options.isCurrent) {
+ var _class = $clone.attr("class").replace(/\s*(col-lg-offset-|col-md-offset-)([0-9-]+)/g, '');
+ $clone.attr("class", _class);
+ }
return false;
},
on_resize: function (compass, beginClass, current) {