Skip to content
Snippets Groups Projects
Commit 05f62179 authored by jkerdreu's avatar jkerdreu
Browse files

Drop message cnt & so on


git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/fork@1813 b32b6428-25c9-4566-ad07-03861ab6144f
parent f0fc1171
No related branches found
No related tags found
No related merge requests found
var tags = {};
var msg_cnt = 0;
var evt_bus = new EventBus();
var sio = io.connect('ws://' + document.domain + ':' + location.port);
const sio = io.connect('ws://' + document.domain + ':' + location.port,{transports: ['websocket'],forceNew:true});
//================ JS tools ==========================================
......@@ -32,12 +31,6 @@ function detectMobile() {
}
//================ UI stuffs ====================================================
function updateStatusCnt() {
_('#socket-status').innerText = "+cnt " + msg_cnt + ' ('+sio.io.engine.transport.name+')';
}
//================ Event stuffs ================================================
function EventBus () {
riot.observable(this);
......@@ -45,35 +38,41 @@ function EventBus () {
this.connected = false;
this.on('sio-connect',function() {
console.log('Event : connected');
this.log('Event : connected ' + sio.io.engine.transport.name);
this.connected = true;
this.refresh_attributes();
});
this.on('sio-disconnect',function() {
console.log('Event : disconnected');
this.log('Event : disconnected');
this.connected = false;
});
this.on('tags-mount',function() {
console.log('Event : mounted');
this.log('Event : mounted');
this.mounted = true;
this.refresh_attributes();
});
this.on('visible',function() {
console.log('Event : visible');
_('#messages').innerText = 'visible ==' + Math.random();
this.log('Event : visible');
this.refresh_attributes();
});
this.refresh_attributes = function() {
if ((this.connected == true) && (this.mounted==true)) {
sio_refresh_attributes();
msg_cnt = 0;
updateStatusCnt();
this.log('refresh');
}
}
this.log = function(msg) {
console.log(msg);
elt = _('#messages');
//elt.style.color = 'green';
elt.innerText = elt.innerText +"\n" + msg;
}
};
function visibilityChanged(data) {
......@@ -86,22 +85,14 @@ function visibilityChanged(data) {
//================ SocketIO Events ==============================================
sio.on('connect', function() {
elt = _('#socket-status');
elt.style.color = 'green';
elt.innerText = "id: " + sio.id + ' ('+sio.io.engine.transport.name+')';
evt_bus.trigger('sio-connect');
});
sio.on('disconnect', function() {
elt = _('#socket-status');
elt.style.color = 'red';
elt.innerText = "not connected";
evt_bus.trigger('sio-disconnect');
});
sio.on('event_attributeChanges', function(data) {
msg_cnt ++ ;
//updateStatusCnt();
for (t in tags) {
var attrs = tags[t].root.attributes;
if (attrs.hasOwnProperty('xaal_addr')) {
......@@ -151,6 +142,8 @@ function sio_query_attributes(addr) {
}
//================ Main =========================================================
_('#messages').innerText = 'no messages';
evt_bus.log('riot_compile');
riot.compile(function() {
tags = riot.mount('*');
evt_bus.trigger('tags-mount');
......@@ -162,4 +155,3 @@ if (detectMobile() == true) {
document.addEventListener("visibilitychange", visibilityChanged);
}
_('#messages').innerText = 'no messages';
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment