summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2012-01-04 16:53:29 +0100
committerniv-openerp <nicolas.vanhoren@openerp.com>2012-01-04 16:53:29 +0100
commit2f1dace76a5f2e06aea250687519dbdc481e60b8 (patch)
tree009794c2c70d796a11090416c154958f530ead31 /addons/web/static/src/js
parent0e3809d8ccb0d51d06d1f762d0f37f49bc29c0a7 (diff)
[fix] rollback 1873 & 1871 to correct bugs related to login page & dialogs
bzr revid: nicolas.vanhoren@openerp.com-20120104155329-tfk6gt4mjhme82od
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/chrome.js2
-rw-r--r--addons/web/static/src/js/core.js2
-rw-r--r--addons/web/static/src/js/view_form.js4
3 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 06bfcbfcf14..7b53c4dd5ab 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -1042,7 +1042,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
this._current_state = null;
},
render_element: function() {
- this.$element = $('<div/>');
+ this.$element = $('<body/>');
this.$element.attr("id", "oe");
this.$element.addClass("openerp");
},
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index c74b1df0160..944a9d659a6 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -502,7 +502,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
.attr('action', ajax.url + '?' + $.param(data))
.append($('<input type="hidden" name="r" />').attr('value', payload_str))
.hide()
- .appendTo($('.openerp'));
+ .appendTo($('body'));
var cleanUp = function() {
if ($iframe) {
$iframe.unbind("load").attr("src", "javascript:false;").remove();
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e338bcec534..1321be93ca7 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1544,7 +1544,7 @@ openerp.web.form.FieldText = openerp.web.form.Field.extend({
_.each('font-family,font-size,white-space'.split(','), function(style) {
$div.css(style, $input.css(style));
});
- $div.appendTo($(".openerp"));
+ $div.appendTo($('body'));
new_height = $div.height();
if (new_height < 90) {
new_height = 90;
@@ -3155,7 +3155,7 @@ openerp.web.form.FieldStatus = openerp.web.form.Field.extend({
var div = $("<div></div>");
div.css("display", "none");
div.css("color", color);
- div.appendTo($(".openerp"));
+ div.appendTo($("body"));
var ncolor = div.css("color");
div.remove();
var res = /^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/.exec(ncolor);