summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-01-17 15:02:13 +0100
committerXavier Morel <xmo@openerp.com>2012-01-17 15:02:13 +0100
commitaeebcf3dccbd1adfdb4fd62e29043449ef96c603 (patch)
tree87f4b11036fd154eb59407ad34bd395573f7ba38
parent7d305cbbee66251870e825cd44a99a57a41f407c (diff)
[FIX] un-nivity call of WebClient, IE8 does not like nobody to mess with its body:
bzr revid: xmo@openerp.com-20120117140213-u2n1l4cg1nz1xrea
-rw-r--r--addons/web/controllers/main.py4
-rw-r--r--addons/web/static/src/js/chrome.js6
2 files changed, 3 insertions, 7 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7b2ad5b311c..b0a12802db4 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -99,7 +99,7 @@ html_template = """<!DOCTYPE html>
});
</script>
</head>
- <body></body>
+ <body class="openerp" id="oe"></body>
</html>
"""
@@ -207,7 +207,7 @@ class WebClient(openerpweb.Controller):
'js': js,
'css': css,
'modules': simplejson.dumps(self.server_wide_modules(req)),
- 'init': 'new s.web.WebClient().replace($("body"));',
+ 'init': 'new s.web.WebClient().start();',
}
return r
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index be570e3dd84..8b9a0d4efc6 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1062,13 +1062,9 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
this._current_state = null;
},
- render_element: function() {
- this.$element = $('<body/>');
- this.$element.attr("id", "oe");
- this.$element.addClass("openerp");
- },
start: function() {
var self = this;
+ this.$element = $(document.body);
if (jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) {
this.$element.addClass("kitten-mode-activated");
this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) {