diff options
| author | Aaron Bohy <aab@odoo.com> | 2016-04-21 13:58:22 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-04-21 15:21:42 +0200 |
| commit | 6768bbfcc02e0f498110cda2ba9adbc2fd23d24c (patch) | |
| tree | 7dccb1019434582874b285276189b1b3dcbb96a9 /addons/web/static/src/js/framework/crash_manager.js | |
| parent | e1bfd3fbda97ac7a64a585b07be161d5be606cf9 (diff) | |
| parent | 8e440b173e3b273b3aac541f2ec12527f67dfa60 (diff) | |
[MERGE] *: stop duplicating web
Avoid duplicating web addon in enterprise by extracting a common basis.
Enterprise features stay in enterprise, but use that common basis.
In web, mainly:
- JS refactoring and linting
- Conversion of .sass into .less split into multiple files
- Templates cleaning and DOM simplification
- Re-generation of web.pot, and update of .po files
Minor tweaks in some other addons to make them work with this new structure.
Diffstat (limited to 'addons/web/static/src/js/framework/crash_manager.js')
| -rw-r--r-- | addons/web/static/src/js/framework/crash_manager.js | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/addons/web/static/src/js/framework/crash_manager.js b/addons/web/static/src/js/framework/crash_manager.js index 4ab40f456bc..99d949ac311 100644 --- a/addons/web/static/src/js/framework/crash_manager.js +++ b/addons/web/static/src/js/framework/crash_manager.js @@ -40,22 +40,17 @@ var CrashManager = core.Class.extend({ if (!this.active) { return; } - if (this.$indicator){ + if (this.connection_lost) { return; } if (error.code == -32098) { - $.blockUI({ message: '' , overlayCSS: {'z-index': 9999, backgroundColor: '#FFFFFF', opacity: 0.0, cursor: 'wait'}}); - this.$indicator = $('<div class="oe_indicator">' + _t("Trying to reconnect... ") + '<i class="fa fa-refresh"></i></div>'); - this.$indicator.prependTo("body"); - var timeinterval = setInterval(function(){ + core.bus.trigger('connection_lost'); + this.connection_lost = true; + var timeinterval = setInterval(function() { ajax.jsonRpc('/web/webclient/version_info').then(function() { clearInterval(timeinterval); - self.$indicator.html(_t("You are back online")); - self.$indicator.delay(2000).fadeOut('slow',function(){ - $(this).remove(); - self.$indicator.remove(); - }); - $.unblockUI(); + core.bus.trigger('connection_restored'); + self.connection_lost = false; }); }, 2000); return; |
