KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated some minor server stuff

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-11 11:15:47 +02:00
parent e84c8695ab
commit 3f0ff5d40f
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
server/public/assets/js/listeners.js
View File

@@ -105,7 +105,7 @@ try{/*
} else {
Helper.log('Service Worker is not supported in this browser.');
}*/
navigator.serviceWorker.getRegistration('/').then(function(registration) {
registration.unregister();
});
@@ -124,6 +124,9 @@ $().ready(function(){
$(".connect_error").fadeOut(function(){
$(".connect_error").remove();
Materialize.toast("Connected!", 2000, "green lighten");
if(offline) {
socket.emit("offline", {status: true, channel: chan != undefined ? chan.toLowerCase() : ""});
}
if((Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) !== "")){
socket.emit("password", {password: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), channel: chan.toLowerCase()});
}
@@ -612,7 +615,7 @@ function randomString(length){
function change_offline(enabled, already_offline){
Crypt.set_offline(enabled);
offline = enabled;
socket.emit("offline", enabled);
socket.emit("offline", {status: enabled, channel: chan != undefined ? chan.toLowerCase() : ""});
$("#offline-mode").tooltip('remove');
if(enabled){
if(list_html){

9
server/server.js
View File

@@ -207,10 +207,17 @@ io.on('connection', function(socket){
}
});
socket.on("offline", function(status){
socket.on("offline", function(msg){
if(!msg.hasOwnProperty('status') && !msg.hasOwnProperty('channel')) {
socket.emit("update_required");
return;
}
var status = msg.status;
var channel = msg.channel;
if(status){
in_list = false;
offline = true;
if(channel != "") coll = channel;
if(coll !== undefined && lists[coll] !== undefined && contains(lists[coll], guid))
{
var index = lists[coll].indexOf(guid);