summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPredrag Stojadinovic <predrag@stojadinovic.net>2013-12-12 11:11:49 +0100
committerPredrag Stojadinovic <predrag@stojadinovic.net>2013-12-12 11:11:49 +0100
commit9c755f9a1cf54c6b006a210ab0997f88bd001350 (patch)
treeaae73ddd9ae41fbd8abadf891d0bfd5b1342ee9d
parentc1fd4e0bab21a2e8a0056e3cb312708256590175 (diff)
downloadweb-socket-js-9c755f9a1cf54c6b006a210ab0997f88bd001350.tar.gz
Fix for Issue #142
Fix for Issue #142 Firefox 26 removed event.initMessageEvent method so this had to be handled.
-rw-r--r--web_socket.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/web_socket.js b/web_socket.js
index 06cc5d0..c74a485 100644
--- a/web_socket.js
+++ b/web_socket.js
@@ -205,7 +205,16 @@
WebSocket.prototype.__createMessageEvent = function(type, data) {
if (document.createEvent && window.MessageEvent && !window.opera) {
var event = document.createEvent("MessageEvent");
- event.initMessageEvent("message", false, false, data, null, null, window, null);
+ if (event.initMessageEvent) { // IE does not accept 'new MessageEvent' so this has to stay
+ event.initMessageEvent("message", false, false, data, null, null, window, null);
+ } else if (event.initEvent) { // needed for FF 26 and possible others soon...
+ var event = new MessageEvent('message', {
+ 'view': window,
+ 'bubbles': false,
+ 'cancelable': false,
+ 'data': data
+ });
+ }
return event;
} else {
// IE and Opera, the latter one truncates the data parameter after any 0x00 bytes.