From ce3ebe5cebf8b040dae066ac8077aacf4aed2b3d Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Tue, 11 Sep 2012 12:12:51 +0530 Subject: [PATCH 1/2] [IMP] For firefox browser css apply on blockUI. bzr revid: bth@tinyerp.com-20120911064251-vh6j1au1lzpj0k44 --- addons/web/static/lib/jquery.blockUI/jquery.blockUI.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js index 04db883c76e..6aba71ec58d 100644 --- a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js +++ b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js @@ -260,13 +260,14 @@ function install(el, opts) { lyr3.css(themedCSS); lyr3.addClass('ui-widget-content'); } - else + else lyr3.css(css); } - // style the overlay if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform)))) - lyr2.css(opts.overlayCSS); + lyr2.css(opts.overlayCSS); + if ($.browser.mozilla && /Linux/.test(navigator.platform)) + lyr2.css(opts.overlayCSS); lyr2.css('position', full ? 'fixed' : 'absolute'); // make iframe layer transparent in IE From 75de060cd836578962788a61c4a2728aedd95d80 Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Tue, 11 Sep 2012 12:27:11 +0530 Subject: [PATCH 2/2] [IMP] Indentation. bzr revid: bth@tinyerp.com-20120911065711-hm4ka55a3g4g6e9j --- addons/web/static/lib/jquery.blockUI/jquery.blockUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js index 6aba71ec58d..58c11f46f9f 100644 --- a/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js +++ b/addons/web/static/lib/jquery.blockUI/jquery.blockUI.js @@ -265,9 +265,9 @@ function install(el, opts) { } // style the overlay if (!opts.theme && (!opts.applyPlatformOpacityRules || !($.browser.mozilla && /Linux/.test(navigator.platform)))) - lyr2.css(opts.overlayCSS); + lyr2.css(opts.overlayCSS); if ($.browser.mozilla && /Linux/.test(navigator.platform)) - lyr2.css(opts.overlayCSS); + lyr2.css(opts.overlayCSS); lyr2.css('position', full ? 'fixed' : 'absolute'); // make iframe layer transparent in IE