From 284ef3cc1a54e3f8399d66ce8af848bdfae8578b Mon Sep 17 00:00:00 2001
From: Joel Martin <github@martintribe.org>
Date: Wed, 11 May 2011 15:14:46 -0500
Subject: [PATCH] Send 'base64' sub-protocol. JSLint.

- Also report back sub-protocol that the server chooses.
---
 include/websock.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/websock.js b/include/websock.js
index 31e156d..992e190 100644
--- a/include/websock.js
+++ b/include/websock.js
@@ -45,6 +45,7 @@ if (window.WebSocket) {
 
 
 function Websock() {
+"use strict";
 
 var api = {},         // Public API
     websocket = null, // WebSocket object
@@ -75,7 +76,7 @@ function get_rQ() {
 function get_rQi() {
     return rQi;
 }
-set_rQi = function(val) {
+function set_rQi(val) {
     rQi = val;
 };
 
@@ -253,10 +254,15 @@ function open(uri) {
     init();
 
     websocket = new WebSocket(uri, 'base64');
+    // TODO: future native binary support
+    //websocket = new WebSocket(uri, ['binary', 'base64']);
 
     websocket.onmessage = recv_message;
     websocket.onopen = function() {
         Util.Debug(">> WebSock.onopen");
+        if (websocket.protocol) {
+            Util.Info("Server chose sub-protocol: " + websocket.protocol);
+        }
         eventHandlers.open();
         Util.Debug("<< WebSock.onopen");
     };
@@ -309,7 +315,6 @@ function constructor() {
     api.send         = send;
     api.send_string  = send_string;
 
-    api.recv_message = recv_message;
     api.on           = on;
     api.init         = init;
     api.open         = open;