diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-27 07:46:57 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-27 07:46:57 +1300 |
| commit | 1821783dc810306d62e7a71f992778e861b70ffd (patch) | |
| tree | 57777e02274a8e50a2afcfbf60fffca565a56c1c /web | |
| parent | 0ff4530e766900954ac8e621143304e237c2d7e4 (diff) | |
| download | trackermap-server-1821783dc810306d62e7a71f992778e861b70ffd.tar.gz trackermap-server-1821783dc810306d62e7a71f992778e861b70ffd.tar.bz2 trackermap-server-1821783dc810306d62e7a71f992778e861b70ffd.zip | |
Support SSL WebSocket connection (fix #1624)
Diffstat (limited to 'web')
| -rw-r--r-- | web/app/controller/Root.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index 7978d1b1b..ff76268b3 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -84,7 +84,9 @@ Ext.define('Traccar.controller.Root', { }, asyncUpdate: function (first) { - var socket = new WebSocket('ws://' + window.location.host + '/api/socket'); + var protocol, socket; + protocol = location.protocol === 'https:' ? 'wss:' : 'ws:'; + socket = new WebSocket(protocol + window.location.host + '/api/socket'); socket.onmessage = function (event) { var i, store, data, array, entity; |