From d4b772aeb580fb400a86f58de366e43924f4483e Mon Sep 17 00:00:00 2001
From: Guillermo Rauch <rauchg@gmail.com>
Date: Wed, 17 Mar 2010 12:01:02 -0700
Subject: [PATCH] Lazy loading of Flash removed temporarily due to a bug in
 Safari 4

---
 lib/transports/flashsocket.js | 28 +++-------------------------
 lib/transports/websocket.js   |  2 +-
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/lib/transports/flashsocket.js b/lib/transports/flashsocket.js
index 72d684ab..ae90c2c8 100644
--- a/lib/transports/flashsocket.js
+++ b/lib/transports/flashsocket.js
@@ -1,29 +1,7 @@
 io.Transport.flashsocket = io.Transport.websocket.extend({
 
-  _ready: false,
-
   init: function(base){
-    this.__super__(base);
-    
-    if (!('WebSocket' in window)){        
-      if (!('swfobject' in window)) io.lab.script(io.path + 'lib/vendor/web-socket-js/swfobject.js').wait();
-      if (!('FABridge' in window)) io.lab.script(io.path + 'lib/vendor/web-socket-js/FABridge.js').wait();
-      
-      var self = this;      
-      io.lab.script(io.path + 'lib/vendor/web-socket-js/web_socket.js').wait(function(){        
-        WebSocket.__swfLocation = io.path + 'lib/vendor/web-socket-js/WebSocketMain.swf';
-        self._ready = true;
-        if (self._doConnect) self.connect();
-      });
-    }        
-  },
-
-  connect: function(){
-    if (!this._ready){
-      this._doConnect = true;
-      return this;
-    } 
-    return this.__super__();
+    this.__super__(base);     
   },
   
   _onClose: function(){
@@ -41,12 +19,12 @@ io.Transport.flashsocket = io.Transport.websocket.extend({
 
 io.Transport.flashsocket.check = function(){
   if ('navigator' in window && navigator.plugins){
-    return !! navigator.plugins['Shockwave Flash'].description;
+    return !! navigator.plugins['Shockwave Flash'].description && ('__initialize' in WebSocket);
   } 
 
   if ('ActiveXObject' in window){
     try {
-      return !! new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
+      return !! new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version') && ('__initialize' in WebSocket);
     } catch (e){}      
   }
 
diff --git a/lib/transports/websocket.js b/lib/transports/websocket.js
index 9ba0d0da..eb631caf 100644
--- a/lib/transports/websocket.js
+++ b/lib/transports/websocket.js
@@ -36,5 +36,5 @@ io.Transport.websocket = io.Transport.extend({
 });
 
 io.Transport.websocket.check = function(){
-  return 'WebSocket' in window;
+  return 'WebSocket' in window && !('__initialize' in WebSocket);
 };
\ No newline at end of file