Download as
Browse Code »

Commit c0d16b19e751ff5a28093b106ffc514bfaf04eff

Authored by Jailson Dias
1 parent 22b6da28
Exists in master and in 2 other branches amadeus_univasf, refactoring

alterações para pegar pegar o websocket e jitsi no servidor

Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
amadeus/static/js/socket.js
  Diff comments   View file @c0d16b1
... ... @@ -4,7 +4,7 @@ if (("Notification" in window)) {
4 4 }
5 5 }
6 6  
7   -socket = new WebSocket("ws://" + window.location.host + "/");
  7 +socket = new WebSocket("wss://" + window.location.host + "/");
8 8  
9 9 socket.onmessage = function(e) {
10 10 content = JSON.parse(e.data);
... ... @@ -46,7 +46,7 @@ function muralNotificationPost(content) {
46 46 $(content.container).prepend(content.complete);
47 47  
48 48 $('.no-subjects').attr('style', 'display:none');
49   - }
  49 + }
50 50 } else {
51 51 $('.mural_badge').each(function () {
52 52 var actual = $(this).text();
... ... @@ -257,7 +257,7 @@ function messageReceived(content) {
257 257 talk_notifies.text(actual_count);
258 258  
259 259 actual_date.html(content.last_date);
260   -
  260 +
261 261 $('.chat_badge').each(function () {
262 262 var actual = $(this).text();
263 263  
... ... @@ -303,7 +303,7 @@ function messageReceived(content) {
303 303  
304 304 setTimeout(notification.close.bind(notification), 3000);
305 305 }
306   - }
  306 + }
307 307 }
308 308  
309 309 function changeUserStatus(content) {
... ... @@ -318,4 +318,4 @@ function changeUserStatus(content) {
318 318 }
319 319  
320 320 elem.attr('data-original-title', content.status);
321   -}
322 321 \ No newline at end of file
  322 +}
... ...
amadeus/templates/base.html
  Diff comments   View file @c0d16b1
... ... @@ -14,7 +14,7 @@
14 14 <meta http-equiv="Cache-Control" content="no-cache, no-store" />
15 15 <link href="{{ theme.favicon_url }}" rel="shortcut icon" />
16 16 <!-- Roboto font -->
17   - <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
  17 + <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css">
18 18 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
19 19  
20 20 <!-- Bootstrap and themes (material) -->
... ...