summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-07-25 10:04:39 +0200
committerAntony Lesuisse <al@openerp.com>2012-07-25 10:04:39 +0200
commita4f1ce69ab01818fce1a23fc3744865bcc4fd85c (patch)
treef9f89046eaa853f453ee0f00bd26f669e46b6dce /addons/web/static/src
parent0b2ccd00e082818253baaf2e880f4e0b1dae12fb (diff)
[FIX] throbber use an image. fva will fix the aliasing.
Also check http://commons.wikimedia.org/wiki/Category:Throbbers bzr revid: al@openerp.com-20120725080439-j7f44tb0fbp90cm0
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/img/throbber.gifbin673 -> 7625 bytes
-rw-r--r--addons/web/static/src/js/coresetup.js28
2 files changed, 2 insertions, 26 deletions
diff --git a/addons/web/static/src/img/throbber.gif b/addons/web/static/src/img/throbber.gif
index ded8d36d486..7ab8346ce09 100644
--- a/addons/web/static/src/img/throbber.gif
+++ b/addons/web/static/src/img/throbber.gif
Binary files differ
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 24441dc509f..9d365a0a2b3 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -550,38 +550,14 @@ $.async_when = function() {
/** Setup blockui */
if ($.blockUI) {
$.blockUI.defaults.baseZ = 1100;
- $.blockUI.defaults.message = '<div class="oe_blockui_spin" style="height: 50px">';
+ $.blockUI.defaults.message = '<img src="/web/static/src/img/throbber.gif">';
$.blockUI.defaults.css.border = '0';
$.blockUI.defaults.css["background-color"] = '';
- $.blockUI.spinners = [];
}
instance.web.blockUI = function() {
- var tmp = $.blockUI.apply($, arguments);
- var target = $(".oe_blockui_spin")[0];
- var opts = {
- lines: 13, // The number of lines to draw
- length: 7, // The length of each line
- width: 4, // The line thickness
- radius: 10, // The radius of the inner circle
- rotate: 0, // The rotation offset
- color: '#FFF', // #rgb or #rrggbb
- speed: 1, // Rounds per second
- trail: 60, // Afterglow percentage
- shadow: false, // Whether to render a shadow
- hwaccel: false, // Whether to use hardware acceleration
- className: 'spinner', // The CSS class to assign to the spinner
- zIndex: 2e9, // The z-index (defaults to 2000000000)
- top: 'auto', // Top position relative to parent in px
- left: 'auto' // Left position relative to parent in px
- };
- var spinner = new Spinner(opts).spin(target);
- $.blockUI.spinners.push(spinner);
- return tmp;
+ $.blockUI.apply($, arguments);
}
instance.web.unblockUI = function() {
- _.each($.blockUI.spinners, function(el) {
- el.stop();
- });
return $.unblockUI.apply($, arguments);
}