AFB.js: fix bug (minor)

Change-Id: I37ee5f599cf49a6a1c6b1e27cf3fcdd29b280c4a
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

2 files changed, 23 insertions, 7 deletions

diff --git a/test/AFB.js b/test/AFB.js
index 88da4d55..59e68abc 100644
--- a/test/AFB.js
+++ b/test/AFB.js
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author: José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 AFB = function(base, initialtoken){
 
 if (typeof base != "object")
@@ -5,7 +21,7 @@ if (typeof base != "object")
 
 var initial = {
 	base: base.base || "api",
-	token: base.token || "hello",
+	token: base.token || initialtoken || "hello",
 	host: base.host || window.location.host,
 	url: base.url || undefined
 };
@@ -50,7 +66,7 @@ var AFB_websocket;
 
 	var PROTO1 = "x-afb-ws-json1";
 
-	AFB_websocket = function(onopen, onabort) {
+	AFB_websocket = function(on_open, on_abort) {
 		var u = urlws;
 		if (AFB_context.token) {
 			u = u + '?x-afb-token=' + AFB_context.token;
@@ -66,8 +82,8 @@ var AFB_websocket;
 		this.ws.onerror = onerror.bind(this);
 		this.ws.onclose = onclose.bind(this);
 		this.ws.onmessage = onmessage.bind(this);
-		this.onopen = onopen;
-		this.onabort = onabort;
+		this.onopen = on_open;
+		this.onabort = on_abort;
 	}
 
 	function onerror(event) {
diff --git a/test/monitoring/AFB.js b/test/monitoring/AFB.js
index 30fb9826..59e68abc 100644
--- a/test/monitoring/AFB.js
+++ b/test/monitoring/AFB.js
@@ -66,7 +66,7 @@ var AFB_websocket;
 
 	var PROTO1 = "x-afb-ws-json1";
 
-	AFB_websocket = function(onopen, onabort) {
+	AFB_websocket = function(on_open, on_abort) {
 		var u = urlws;
 		if (AFB_context.token) {
 			u = u + '?x-afb-token=' + AFB_context.token;
@@ -82,8 +82,8 @@ var AFB_websocket;
 		this.ws.onerror = onerror.bind(this);
 		this.ws.onclose = onclose.bind(this);
 		this.ws.onmessage = onmessage.bind(this);
-		this.onopen = onopen;
-		this.onabort = onabort;
+		this.onopen = on_open;
+		this.onabort = on_abort;
 	}
 
 	function onerror(event) {