summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2016-02-10 11:11:12 +0100
committerGéry Debongnie <ged@odoo.com>2016-02-17 09:47:46 +0100
commit831246fc9d928355d0e14709fa5c256fe3fb3d19 (patch)
tree892ec5402b416e51b48247c52c53455760a98a48 /addons/web/static/src
parent0208b91deffe29720d047d3c71aec992ba37b779 (diff)
[IMP] web: remove spin lib and replace by an image with css to spin
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/img/spin.pngbin0 -> 570 bytes
-rw-r--r--addons/web/static/src/js/framework/misc.js23
-rw-r--r--addons/web/static/src/xml/base.xml1
3 files changed, 1 insertions, 23 deletions
diff --git a/addons/web/static/src/img/spin.png b/addons/web/static/src/img/spin.png
new file mode 100644
index 00000000000..8cbd006b56d
--- /dev/null
+++ b/addons/web/static/src/img/spin.png
Binary files differ
diff --git a/addons/web/static/src/js/framework/misc.js b/addons/web/static/src/js/framework/misc.js
index 25e80c33e84..b8c5e5e927e 100644
--- a/addons/web/static/src/js/framework/misc.js
+++ b/addons/web/static/src/js/framework/misc.js
@@ -7,7 +7,6 @@ var session = require('web.session');
var Widget = require('web.Widget');
var _t = core._t;
-var Spinner = window.Spinner;
var messages_by_seconds = function() {
return [
@@ -24,23 +23,6 @@ var messages_by_seconds = function() {
var Throbber = Widget.extend({
template: "Throbber",
start: function() {
- 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
- };
- this.spin = new Spinner(opts).spin(this.$el[0]);
this.start_time = new Date().getTime();
this.act_message();
},
@@ -59,11 +41,6 @@ var Throbber = Widget.extend({
self.act_message();
}, 1000);
},
- destroy: function() {
- if (this.spin)
- this.spin.stop();
- this._super();
- },
});
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f4e7e45740f..e7e95b7b9b6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1411,6 +1411,7 @@
<t t-name="Throbber">
<div>
<div class="oe_blockui_spin" style="height: 50px">
+ <img src="/web/static/src/img/spin.png" style="animation: fa-spin 1s infinite steps(12);"/>
</div>
<br />
<div class="oe_throbber_message" style="color:white"></div>