From 977db823c7c84e9edc7c8cf8384eb9cf47275b3a Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Fri, 8 Apr 2016 14:53:34 +0200 Subject: [REF] web: stop duplicating web Avoid duplicating web addon in enterprise by extracting a common basis. Enterprise features stay in enterprise, but use that common basis. 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 --- addons/web/static/src/js/framework/crash_manager.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'addons/web/static/src/js/framework/crash_manager.js') 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 = $('
' + _t("Trying to reconnect... ") + '
'); - 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; -- cgit v1.2.3