Merge pull request #194 from markevans-sky/no-implicit-global-websocket

No implicit global WebSocket
eclipse-paho · Jun 4, 2019 · 026fd95 · 026fd95
2 parents 55cf306 + 03c553f
commit 026fd95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/paho-mqtt.js b/src/paho-mqtt.js
@@ -1057,9 +1057,9 @@ function onMessageArrived(message) {
 
 
 			if (this.connectOptions.mqttVersion < 4) {
-				this.socket = new WebSocket(wsurl, ["mqttv3.1"]);
+				this.socket = new global.WebSocket(wsurl, ["mqttv3.1"]);
 			} else {
-				this.socket = new WebSocket(wsurl, ["mqtt"]);
+				this.socket = new global.WebSocket(wsurl, ["mqtt"]);
 			}
 			this.socket.binaryType = "arraybuffer";
 			this.socket.onopen = scope(this._on_socket_open, this);

diff --git a/src/test/client-harness.js b/src/test/client-harness.js
@@ -65,7 +65,7 @@ global.Paho = Paho
 
 
 function ensureValue(prop, value) {
-  if (prop === '' || prop[0] === '$') {
+  if (prop === undefined || prop === '' || prop[0] === '$') {
     return value
   }
   return prop