Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update copyright dates
[src/app-framework-binder.git]
/
test
/
monitoring
/
AFB.js
diff --git
a/test/monitoring/AFB.js
b/test/monitoring/AFB.js
index
c80f651
..
e74fbe9
100644
(file)
--- a/
test/monitoring/AFB.js
+++ b/
test/monitoring/AFB.js
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 201
7-2019
"IoT.bzh"
+ * Copyright (C) 201
5-2020
"IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-21,7
+21,10
@@
if (typeof base != "object")
var initial = {
base: base.base || "api",
var initial = {
base: base.base || "api",
- token: base.token || initialtoken || "HELLO",
+ token: initialtoken || base.token
+ || URLSearchParams(window.location.search).get('access_token')
+ || URLSearchParams(window.location.search).get('token')
+ || "HELLO",
host: base.host || window.location.host,
url: base.url || undefined
};
host: base.host || window.location.host,
url: base.url || undefined
};
@@
-92,7
+95,7
@@
var AFB_websocket;
if (f) {
delete this.onopen;
delete this.onabort;
if (f) {
delete this.onopen;
delete this.onabort;
- f
&& f
(this);
+ f(this);
}
this.onerror && this.onerror(this);
}
}
this.onerror && this.onerror(this);
}
@@
-122,16
+125,16
@@
var AFB_websocket;
function fire(awaitens, name, data) {
var a = awaitens[name];
if (a)
function fire(awaitens, name, data) {
var a = awaitens[name];
if (a)
- a.forEach(function(handler){handler(data);});
+ a.forEach(function(handler){handler(data
, name
);});
var i = name.indexOf("/");
if (i >= 0) {
a = awaitens[name.substring(0,i)];
if (a)
var i = name.indexOf("/");
if (i >= 0) {
a = awaitens[name.substring(0,i)];
if (a)
- a.forEach(function(handler){handler(data);});
+ a.forEach(function(handler){handler(data
, name
);});
}
a = awaitens["*"];
if (a)
}
a = awaitens["*"];
if (a)
- a.forEach(function(handler){handler(data);});
+ a.forEach(function(handler){handler(data
, name
);});
}
function reply(pendings, id, ans, offset) {
}
function reply(pendings, id, ans, offset) {
@@
-151,14
+154,14
@@
var AFB_websocket;
switch (code) {
case RETOK:
reply(this.pendings, id, ans, 0);
switch (code) {
case RETOK:
reply(this.pendings, id, ans, 0);
- break;
+ break;
case RETERR:
reply(this.pendings, id, ans, 1);
case RETERR:
reply(this.pendings, id, ans, 1);
- break;
+ break;
case EVENT:
default:
fire(this.awaitens, id, ans);
case EVENT:
default:
fire(this.awaitens, id, ans);
- break;
+ break;
}
}
}
}