summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi Ichikawa <gimite@gmail.com>2011-03-13 18:18:44 +0900
committerHiroshi Ichikawa <gimite@gmail.com>2011-03-13 18:18:44 +0900
commitbb5797cad5244dc86410e35726ef886bbc49afe9 (patch)
tree000dcf3a9ea7aef098a80ab7dc0c8f9fabec8ff7
parent7414b2e42d1e6e27b1a297caa17f38212a534dd2 (diff)
downloadweb-socket-js-bb5797cad5244dc86410e35726ef886bbc49afe9.tar.gz
Fixing an error on IE when window.Event is defined by user.
-rw-r--r--web_socket.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/web_socket.js b/web_socket.js
index c1ce6f7..ec2a8b7 100644
--- a/web_socket.js
+++ b/web_socket.js
@@ -160,7 +160,7 @@
};
WebSocket.prototype.__createSimpleEvent = function(type) {
- if (window.Event) {
+ if (document.createEvent && window.Event) {
var event = document.createEvent("Event");
event.initEvent(type, false, false);
return event;
@@ -170,7 +170,7 @@
};
WebSocket.prototype.__createMessageEvent = function(type, data) {
- if (window.MessageEvent && !window.opera) {
+ if (document.createEvent && window.MessageEvent && !window.opera) {
var event = document.createEvent("MessageEvent");
event.initMessageEvent("message", false, false, data, null, null, window, null);
return event;