masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

websockets: add support for user specified onmessage

This commit is contained in:
David Cormier 2014-02-14 09:09:09 -05:00
parent c11a01d67c
commit e68e7dd01d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/glowingbear.js
View File

@ -338,13 +338,13 @@ function($rootScope,
return '(' + id + ') ' + message; return '(' + id + ') ' + message;
}; };
ngWebsockets.connect(url, ngWebsockets.connect(url,
protocol, protocol,
{ {
'binaryType': "arraybuffer", 'binaryType': "arraybuffer",
'onopen': onopen, 'onopen': onopen,
'onclose': onclose, 'onclose': onclose,
'onmessage': onmessage,
'onerror': onerror, 'onerror': onerror,
}); });

8
js/websockets.js
View File

@ -108,7 +108,6 @@ function($rootScope, $q) {
} }
$rootScope.commands.push("RECV: " + evt.data + " TYPE:" + evt.type); $rootScope.commands.push("RECV: " + evt.data + " TYPE:" + evt.type);
$rootScope.$apply(); $rootScope.$apply();
}; };
var connect = function(url, var connect = function(url,
@ -121,7 +120,14 @@ function($rootScope, $q) {
ws[property] = properties[property]; ws[property] = properties[property];
} }
if ('onmessage' in properties) {
ws.onmessage = function(event) {
properties['onmessage'](event);
onmessage(event);
}
} else {
ws.onmessage = onmessage; ws.onmessage = onmessage;
}
}; };
var disconnect = function() { var disconnect = function() {