odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Remove watcher, need to be review because it breaks other tests. 

bzr revid: jke@openerp.com-20140414165721-i8g23jxy66p1p6ao
This commit is contained in:
Kersten Jeremy 2014-04-14 18:57:21 +02:00
parent faa899adde
commit 9c739f12c2
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/website/views/website_templates.xml
View File

@ -74,17 +74,7 @@
// 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;
});
</script>
<script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>