From cace9f78878ca3e3e143174220dfdfd306d13c86 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 15 Nov 2012 17:41:32 +0100 Subject: [PATCH] [IMP] Centralized 'openerp' class on top level elements. Also add openerp_ie class for MSIE bzr revid: fme@openerp.com-20121115164132-i6a0u8zk3knm1zkv --- addons/web/controllers/main.py | 3 +-- addons/web/static/lib/jquery.tipsy/jquery.tipsy.js | 3 ++- addons/web/static/src/js/chrome.js | 3 ++- addons/web/static/src/js/coresetup.js | 10 ++++++++++ addons/web/static/src/js/view_form.js | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 0b3d5341b11..cfdad2e3730 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -549,8 +549,7 @@ def content_disposition(filename, req): #---------------------------------------------------------- html_template = """ - - + diff --git a/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js b/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js index 5929d591261..e978042f21b 100644 --- a/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js +++ b/addons/web/static/lib/jquery.tipsy/jquery.tipsy.js @@ -27,7 +27,8 @@ var $tip = this.tip(); $tip.find('.tipsy-inner')[this.options.html ? 'html' : 'text'](title); - $tip[0].className = 'tipsy openerp oe_tooltip '; // reset classname in case of dynamic gravity + $tip[0].className = 'tipsy '; // reset classname in case of dynamic gravity + $tip.openerpClass('oe_tooltip'); $tip.remove().css({top: 0, left: 0, visibility: 'hidden', display: 'block'}).prependTo(document.body); var pos = $.extend({}, this.$element.offset(), { diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index f5fc7b8f632..941d26db6c6 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -48,7 +48,7 @@ instance.web.Notification = instance.web.Widget.extend({ */ instance.web.dialog = function(element) { var result = element.dialog.apply(element, _.rest(_.toArray(arguments))); - result.dialog("widget").addClass("openerp"); + result.dialog("widget").openerpClass(); return result; }; @@ -983,6 +983,7 @@ instance.web.Client = instance.web.Widget.extend({ return instance.session.session_bind(this.origin).then(function() { var $e = $(QWeb.render(self._template, {})); self.replaceElement($e); + $e.openerpClass(); self.bind_events(); return self.show_common(); }); diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index f3166285fe7..7789bb48785 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -460,6 +460,16 @@ $.fn.getAttributes = function() { } return o; } +$.fn.openerpClass = function(additionalClass) { + // This plugin should be applied on top level elements + additionalClass = additionalClass || ''; + if (!!$.browser.msie) { + additionalClass += ' openerp_ie'; + } + return this.each(function() { + $(this).addClass('openerp ' + additionalClass); + }); +}; /** Jquery extentions */ $.Mutex = (function() { diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a955da06eea..ffdc49513b8 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3122,7 +3122,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc minLength: 0, delay: 0 }); - this.$input.autocomplete("widget").addClass("openerp"); + this.$input.autocomplete("widget").openerpClass(); // used to correct a bug when selecting an element by pushing 'enter' in an editable list this.$input.keyup(function(e) { if (e.which === 13) { // ENTER