From ad575c3697bcdac7867a0f77a18e8171b09d43d7 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Thu, 7 Dec 2017 19:15:20 +0100 Subject: [PATCH] upd: view.websocket (updated 'response.data' instead of 'response.msg' for channels: /event AND /emergency --- view/websocket.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/view/websocket.js b/view/websocket.js index 72ff9e5..34ba274 100644 --- a/view/websocket.js +++ b/view/websocket.js @@ -16,25 +16,24 @@ window.wsc_emergency = wsc.channel('emergency').listen(function(msg, err){ return infobox.show('Erreur de connexion WebSocket@emergency', 'warning', 3000); /* (3) If no message -> exit */ - if( msg.msg == null ) + if( msg.data == null ) return; /* (4) Play sound if 1msg received + not already on page */ // note: 1msg means a new message but not the page load past buffer - if( msg.msg.length == 1 && router.app.$route.path != '/emergency' ) + if( msg.data.length == 1 && router.app.$route.path != '/emergency' ) ( new Audio('https://notificationsounds.com/message-tones/communication-channel-519/download/mp3') ).play(); /* (5) Add messages to stack */ - gstore.data.notif.emergency.data = gstore.data.notif.emergency.data.concat( msg.msg ); + gstore.data.notif.emergency.data = gstore.data.notif.emergency.data.concat( msg.data ); /* (6) Add notification count if not already on page */ if( router.app.$route.path != '/emergency' ) - gstore.data.notif.emergency.count += msg.msg.length; + gstore.data.notif.emergency.count += msg.data.length; /* (7) Remove loader */ gstore.data.msg_pending.emergency = false; - }).send({name: _SERVER.session.name}); /* (2) Event channel @@ -50,20 +49,20 @@ window.wsc_event = wsc.channel('event').listen(function(msg, err){ return infobox.show('Erreur de connexion WebSocket@event', 'warning', 3000); /* (3) If no message -> exit */ - if( msg.msg == null ) + if( msg.data == null ) return; /* (4) Play sound if 1msg received + not already on page */ // note: 1msg means a new message but not the page load past buffer - if( msg.msg.length == 1 && router.app.$route.path != '/event' ) + if( msg.data.length == 1 && router.app.$route.path != '/event' ) ( new Audio('https://notificationsounds.com/message-tones/communication-channel-519/download/mp3') ).play(); /* (5) Add messages to stack */ - gstore.data.notif.event.data = gstore.data.notif.event.data.concat( msg.msg ); + gstore.data.notif.event.data = gstore.data.notif.event.data.concat( msg.data ); /* (6) Add notification count if not already on page */ if( router.app.$route.path != '/event' ) - gstore.data.notif.event.count += msg.msg.length; + gstore.data.notif.event.count += msg.data.length; /* (7) Remove loader */ gstore.data.msg_pending.event = false;