From dfe9843845590a157128af4c5e5095d3a028b919 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Mon, 4 Dec 2017 14:53:16 +0100 Subject: [PATCH] remove /*TMP*/ to test websocket.jar --- view/main.js | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/view/main.js b/view/main.js index 39e92c8..d99e6c5 100755 --- a/view/main.js +++ b/view/main.js @@ -40,14 +40,22 @@ window.wsc_connect = window.wsc.channel('connect').listen(function(msg, err){ // {1} Manage error // if( msg == null && err != null ){ - console.warn(err); - /*TEMP*///return; - /*TEMP*/msg = {error: 0, connected: ['guest123', 'guest456', 'guest789']}; + window.gstore.data.info.message = 'Erreur de connexion WebSocket@connect ('+err+')'; + window.gstore.data.info.type = 'warning'; + window.gstore.data.info.active = true; + setTimeout(function(){ window.gstore.data.info.active=false; }, 5000); + /*TEMP*/return; + /*TEMP*///msg = {error: 0, connected: ['guest123', 'guest456', 'guest789']}; } // {2} Manage wsclient error // if( msg.connected == null || msg.error == null || msg.error !== 0 ){ console.warn('websocket error: '+msg.error); + if( msg.error == null ) window.gstore.data.info.message = 'Erreur de connexion WebSocket@connect (Unknown Error)'; + else window.gstore.data.info.message = 'Erreur de connexion WebSocket@connect ('+msg.error+')'; + window.gstore.data.info.type = 'warning'; + window.gstore.data.info.active = true; + setTimeout(function(){ window.gstore.data.info.active=false; }, 5000); return; } @@ -62,14 +70,22 @@ window.wsc_chat = window.wsc.channel('chat').listen(function(msg, err){ // {1} Manage error // if( msg == null && err != null ){ - console.warn(err); - /*TEMP*///return; - /*TEMP*/msg = {error: 0, msg: [['guest123', 'message 1'], ['guest456', 'message 2'], ['guest789', 'message 3']]}; + window.gstore.data.info.message = 'Erreur de connexion WebSocket@connect ('+err+')'; + window.gstore.data.info.type = 'warning'; + window.gstore.data.info.active = true; + setTimeout(function(){ window.gstore.data.info.active=false; }, 5000); + /*TEMP*/return; + /*TEMP*///msg = {error: 0, msg: [['guest123', 'message 1'], ['guest456', 'message 2'], ['guest789', 'message 3']]}; } // {2} Manage wsclient error // if( msg.msg == null || msg.error == null || msg.error !== 0 ){ console.warn('websocket error: '+msg.error); + if( msg.error == null ) window.gstore.data.info.message = 'Erreur de connexion WebSocket@connect (Unknown Error)'; + else window.gstore.data.info.message = 'Erreur de connexion WebSocket@connect ('+msg.error+')'; + window.gstore.data.info.type = 'warning'; + window.gstore.data.info.active = true; + setTimeout(function(){ window.gstore.data.info.active=false; }, 5000); return; }