diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index ea4ba359c5f..2621ec176dd 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -43,6 +43,7 @@ t-att-data-view-xmlid="xmlid if editable else None" t-att-data-main-object="repr(main_object) if editable else None"> + @@ -73,6 +74,17 @@ // Bootstrap and jQuery UI conflicts $.fn.bstooltip = $.fn.tooltip; $.fn.bsbutton = $.fn.button; + + // keep jQuery method alive + window.watch("$", function (prop, oldval, val) { + console.debug("jQuery "+oldval.fn.jquery+" overwritted by jQuery "+val.fn.jquery); + for (var i in oldval.fn) { + if (typeof val.fn[i] === "undefined") { + val.fn[i] = oldval.fn[i]; + } + } + return val; + });