From 545705b01818d4239710633ef9b1dacfafc61b44 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sun, 18 Dec 2016 11:27:28 +1300 Subject: Fallback to REST if WebSocket not available --- web/app/Style.js | 2 ++ web/app/controller/Root.js | 23 ++++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) (limited to 'web/app') diff --git a/web/app/Style.js b/web/app/Style.js index e22869c5..c5fce9b6 100644 --- a/web/app/Style.js +++ b/web/app/Style.js @@ -18,6 +18,8 @@ Ext.define('Traccar.Style', { singleton: true, + reconnectTimeout: 60 * 1000, + normalPadding: 10, windowWidth: 640, diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index 2a20dbe3..0cc2a148 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -130,7 +130,28 @@ Ext.define('Traccar.controller.Root', { socket = new WebSocket(protocol + '//' + window.location.host + pathname + 'api/socket'); socket.onclose = function (event) { - self.asyncUpdate(false); + Ext.toast(Strings.errorSocket, Strings.errorTitle, 'br'); + + Ext.Ajax.request({ + url: 'api/devices', + success: function(response) { + self.updateDevices(Ext.decode(response.responseText)); + } + }); + + Ext.Ajax.request({ + url: 'api/positions', + headers: { + Accept: 'application/json' + }, + success: function(response) { + self.updatePositions(Ext.decode(response.responseText)); + } + }); + + setTimeout(function() { + self.asyncUpdate(false); + }, Traccar.Style.reconnectTimeout); }; socket.onmessage = function (event) { -- cgit v1.2.3