diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/AFB.js | 5 | ||||
| -rw-r--r-- | test/monitoring/AFB.js | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/test/AFB.js b/test/AFB.js index 4c500b99..953fe96a 100644 --- a/test/AFB.js +++ b/test/AFB.js @@ -21,7 +21,10 @@ if (typeof base != "object") var initial = { base: base.base || "api", - token: initialtoken || base.token || URLSearchParams(window.location.search).get('token') || "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 }; diff --git a/test/monitoring/AFB.js b/test/monitoring/AFB.js index c80f6517..953fe96a 100644 --- a/test/monitoring/AFB.js +++ b/test/monitoring/AFB.js @@ -21,7 +21,10 @@ if (typeof base != "object") 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 }; @@ -92,7 +95,7 @@ var AFB_websocket; if (f) { delete this.onopen; delete this.onabort; - f && f(this); + f(this); } this.onerror && this.onerror(this); } @@ -151,14 +154,14 @@ var AFB_websocket; switch (code) { case RETOK: reply(this.pendings, id, ans, 0); - break; + break; case RETERR: reply(this.pendings, id, ans, 1); - break; + break; case EVENT: default: fire(this.awaitens, id, ans); - break; + break; } } |