ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2510 from emanuelschuetze/protocol

Browse Source 
Support https as websocket protocol (wss).
This commit is contained in:
Norman Jäckel 2016-10-17 11:52:02 +02:00 committed by GitHub
commit d2ee235293
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openslides/core/static/js/core/base.js
View File

@ -52,6 +52,13 @@ angular.module('OpenSlidesApp.core', [
var recInterval = null; var recInterval = null;
$rootScope.connected = false; $rootScope.connected = false;
var websocketProtocol;
if (location.protocol == 'https:') {
websocketProtocol = 'wss:';
} else {
websocketProtocol = 'ws:';
}
var websocketPath; var websocketPath;
if (REALM == 'site') { if (REALM == 'site') {
websocketPath = '/ws/site/'; websocketPath = '/ws/site/';
@ -73,7 +80,7 @@ angular.module('OpenSlidesApp.core', [
} }
}; };
var newConnect = function () { var newConnect = function () {
socket = new WebSocket('ws://' + location.host + websocketPath); socket = new WebSocket(websocketProtocol + '//' + location.host + websocketPath);
clearInterval(recInterval); clearInterval(recInterval);
socket.onopen = function () { socket.onopen = function () {
$rootScope.connected = true; $rootScope.connected = true;