From: Darren <darren@darrenwhitlen.com>
Date: Thu, 29 Aug 2013 12:57:43 +0000 (+0100)
Subject: websocketrpc update
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a9cd46221838d0b05ace557516004d872e8decde;p=KiwiIRC.git

websocketrpc update
---

diff --git a/client/assets/libs/websocketrpc.js b/client/assets/libs/websocketrpc.js
index e0a49f0..01554f8 100644
--- a/client/assets/libs/websocketrpc.js
+++ b/client/assets/libs/websocketrpc.js
@@ -45,7 +45,8 @@ WebsocketRpc.prototype._mixinEmitter = function() {
     var funcs = ['on', 'once', 'off', 'removeListener', 'removeAllListeners', 'emit', 'listeners', 'hasListeners'];
 
     for (var i=0; i<funcs.length; i++) {
-        this[funcs[i]] = this._socket[funcs[i]];
+        if (typeof this._socket[funcs[i]] === 'function')
+            this[funcs[i]] = this._socket[funcs[i]];
     }
 };
 
diff --git a/server/websocketrpc.js b/server/websocketrpc.js
index e0a49f0..01554f8 100644
--- a/server/websocketrpc.js
+++ b/server/websocketrpc.js
@@ -45,7 +45,8 @@ WebsocketRpc.prototype._mixinEmitter = function() {
     var funcs = ['on', 'once', 'off', 'removeListener', 'removeAllListeners', 'emit', 'listeners', 'hasListeners'];
 
     for (var i=0; i<funcs.length; i++) {
-        this[funcs[i]] = this._socket[funcs[i]];
+        if (typeof this._socket[funcs[i]] === 'function')
+            this[funcs[i]] = this._socket[funcs[i]];
     }
 };