branch develop updated (24dba11 -> a4817ea)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository mum. See http://git.chorem.org/mum.git from 24dba11 added AGPL header on javascript files new a4817ea use wss WebSocket if site use https The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a4817eaadab60d9c5e1b5b2b70e243b82d3a45fe Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Wed Jul 8 12:48:06 2015 +0200 use wss WebSocket if site use https Summary of changes: static/js/controllers/headCtrl.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit a4817eaadab60d9c5e1b5b2b70e243b82d3a45fe Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Wed Jul 8 12:48:06 2015 +0200 use wss WebSocket if site use https --- static/js/controllers/headCtrl.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/static/js/controllers/headCtrl.js b/static/js/controllers/headCtrl.js index 7a0fffe..37e8c7a 100644 --- a/static/js/controllers/headCtrl.js +++ b/static/js/controllers/headCtrl.js @@ -32,7 +32,11 @@ mumApp.controller('headCtrl', function ($scope, $rootScope, toastr, $interval, $ }); // Concerning WebSocket - var ws = new WebSocket("ws://" + $location.host() + ":" + $location.port() + "/websocket"); + var ssl = ""; + if ($location.protocol() === "https") { + ssl = 's'; + } + var ws = new WebSocket("ws" + ssl + "://" + $location.host() + ":" + $location.port() + "/websocket"); ws.onopen = function () { var request = JSON.stringify({"GET_HOSTS": ""}); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm