diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-07-25 10:26:46 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-07-25 10:26:46 +0200 |
| commit | 3235ed8a1896fbf24e61982e4c06b7d7f0f1815b (patch) | |
| tree | c563cc1ae571e10d95804cb99ff0e7e51a452986 /addons/web/static/src/js/coresetup.js | |
| parent | 974d4f4f106762dafb82b6d6f7a7a43fd6cdacdb (diff) | |
| parent | a4f1ce69ab01818fce1a23fc3744865bcc4fd85c (diff) | |
[MERGE] trunk
bzr revid: al@openerp.com-20120725082646-ff6ljt0pquvm0dup
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 7d101874c07..c9015220ba7 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -550,7 +550,15 @@ $.async_when = function() { /** Setup blockui */ if ($.blockUI) { $.blockUI.defaults.baseZ = 1100; - $.blockUI.defaults.message = '<img src="/web/static/src/img/throbber2.gif">'; + $.blockUI.defaults.message = '<img src="/web/static/src/img/throbber.gif">'; + $.blockUI.defaults.css.border = '0'; + $.blockUI.defaults.css["background-color"] = ''; +} +instance.web.blockUI = function() { + $.blockUI.apply($, arguments); +} +instance.web.unblockUI = function() { + return $.unblockUI.apply($, arguments); } /** Setup default session */ |