projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a8ce541
)
[FIX] Remove watcher
author
Kersten Jeremy
<jke@openerp.com>
Mon, 14 Apr 2014 15:35:37 +0000
(17:35 +0200)
committer
Kersten Jeremy
<jke@openerp.com>
Mon, 14 Apr 2014 15:35:37 +0000
(17:35 +0200)
bzr revid: jke@openerp.com-
20140414153537
-0qjlnqqnk0q9utn0
addons/website/views/website_templates.xml
patch
|
blob
|
history
diff --git
a/addons/website/views/website_templates.xml
b/addons/website/views/website_templates.xml
index
2621ec1
..
2971aff
100644
(file)
--- a/
addons/website/views/website_templates.xml
+++ b/
addons/website/views/website_templates.xml
@@
-76,7
+76,7
@@
$.fn.bsbutton = $.fn.button;
// keep jQuery method alive
- window.watch("$", function (prop, oldval, val) {
+ <!-- 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") {
@@
-84,7
+84,7
@@
}
}
return val;
- });
+ }); -->
</script>
<script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>