diff options
| author | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-11 22:16:25 +0100 |
|---|---|---|
| committer | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-11 22:16:25 +0100 |
| commit | 4606737cc07b736f9c8f98ae680b928c94c082c8 (patch) | |
| tree | bdd29b24a16403b1e8a3d7cd4325391063b34b8a /web/app/controller | |
| parent | 3ced99384b1967f5cde9abdf30c1c0184a5ae3f6 (diff) | |
| parent | ab5d21e16ac44957e04da0f06daf148af95e96be (diff) | |
| download | trackermap-server-4606737cc07b736f9c8f98ae680b928c94c082c8.tar.gz trackermap-server-4606737cc07b736f9c8f98ae680b928c94c082c8.tar.bz2 trackermap-server-4606737cc07b736f9c8f98ae680b928c94c082c8.zip | |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'web/app/controller')
| -rw-r--r-- | web/app/controller/Root.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index 23ca94972..5bd567619 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -73,6 +73,7 @@ Ext.define('Traccar.controller.Root', { }, loadApp: function () { + Ext.getStore('Groups').load(); Ext.getStore('Devices').load(); Ext.get('attribution').remove(); if (this.isPhone) { @@ -86,7 +87,7 @@ Ext.define('Traccar.controller.Root', { asyncUpdate: function (first) { var protocol, socket, self = this; protocol = location.protocol === 'https:' ? 'wss:' : 'ws:'; - socket = new WebSocket(protocol + window.location.host + '/api/socket'); + socket = new WebSocket(protocol + '//' + window.location.host + '/api/socket'); socket.onclose = function (event) { self.asyncUpdate(false); |