Created
February 19, 2014 20:32
-
-
Save jfarcand/9100876 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/modules/javascript/src/main/webapp/javascript/atmosphere.js b/modules/javascript/src/main/webapp/javascript/atmosphere.js | |
index c519583..2ffcb01 100644 | |
--- a/modules/javascript/src/main/webapp/javascript/atmosphere.js | |
+++ b/modules/javascript/src/main/webapp/javascript/atmosphere.js | |
@@ -1227,7 +1227,6 @@ | |
} | |
if (!_request.enableProtocol) { | |
- webSocketOpened = true; | |
if (reopening) { | |
_open('re-opening', "websocket", _request); | |
} else { | |
@@ -1248,9 +1247,7 @@ | |
// We only consider it opened if we get the handshake data | |
// https://github.com/Atmosphere/atmosphere-javascript/issues/74 | |
- if (_request.enableProtocol) { | |
- webSocketOpened = true; | |
- } | |
+ webSocketOpened = true; | |
_response.state = 'messageReceived'; | |
_response.status = 200; | |
diff --git a/modules/jquery/src/main/webapp/jquery/jquery.atmosphere.js b/modules/jquery/src/main/webapp/jquery/jquery.atmosphere.js | |
index 29ba9b9..63afd3c 100644 | |
--- a/modules/jquery/src/main/webapp/jquery/jquery.atmosphere.js | |
+++ b/modules/jquery/src/main/webapp/jquery/jquery.atmosphere.js | |
@@ -1139,7 +1139,6 @@ jQuery.atmosphere = function () { | |
} | |
if (!_request.enableProtocol) { | |
- webSocketOpened = true; | |
if (reopening) { | |
_open('re-opening', "websocket", _request); | |
} else { | |
@@ -1160,9 +1159,7 @@ jQuery.atmosphere = function () { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment