修复open与window.open冲突

jaywcjlove · Nov 3, 2015 · 9349448 · 9349448
1 parent c88114d
commit 9349448
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/build/websocket.min.js b/build/websocket.min.js
diff --git a/lib/websocket.js b/lib/websocket.js
@@ -60,25 +60,25 @@
 
         // 公开 API
         for(var a in _api) this[a] = _api[a];
-
+        
         //用事件处理程序
-        eventTarget.addEventListener('open',       function(event) { self.onopen(event); });
-        eventTarget.addEventListener('close',      function(event) { self.onclose(event); });
-        eventTarget.addEventListener('connecting', function(event) { self.onconnecting(event); });
-        eventTarget.addEventListener('message',    function(event) { self.onmessage(event); });
-        eventTarget.addEventListener('error',      function(event) { self.onerror(event); });
+        eventTarget.addEventListener('open',       function(event) {self!==window&&self.onopen(event); });
+        eventTarget.addEventListener('close',      function(event) {self!==window&&self.onclose(event); });
+        eventTarget.addEventListener('connecting', function(event) {self!==window&&self.onconnecting(event); });
+        eventTarget.addEventListener('message',    function(event) {self!==window&&self.onmessage(event); });
+        eventTarget.addEventListener('error',      function(event) {self!==window&&self.onerror(event); });
 
-
         // 公开事件目标的API
         this.addEventListener = eventTarget.addEventListener.bind(eventTarget);
         this.removeEventListener = eventTarget.removeEventListener.bind(eventTarget);
         this.dispatchEvent = eventTarget.dispatchEvent.bind(eventTarget);
 
 
-        if(this.automaticOpen === true) this.open();
+        if(this.automaticOpen === true&&this!==window) this.open();
         return this;
     }
 
+
     /**
      * [generateEvent 该函数产生一个事件，与标准兼容，兼容的浏览器和IE9 - IE11？]
      * http://stackoverflow.com/questions/19345392/why-arent-my-parameters-getting-passed-through-to-a-dispatched-event/19345563#19345563