summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi Ichikawa <gimite@gmail.com>2011-08-07 13:04:04 +0900
committerHiroshi Ichikawa <gimite@gmail.com>2011-08-07 13:04:04 +0900
commita71f371861dc0c19002ae7ecf8ce6dd60bc5f259 (patch)
treea43ff7195b3515cef33ec22350e87d53e86e5046
parent734625062581438b019967330028848c1b8b531f (diff)
downloadweb-socket-js-a71f371861dc0c19002ae7ecf8ce6dd60bc5f259.tar.gz
Adding flag WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR in case the user rename WebSocketMainInsecure.swf.
-rw-r--r--web_socket.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/web_socket.js b/web_socket.js
index 3a50f90..8507468 100644
--- a/web_socket.js
+++ b/web_socket.js
@@ -226,7 +226,8 @@
console.error("[WebSocket] set WEB_SOCKET_SWF_LOCATION to location of WebSocketMain.swf");
return;
}
- if (!WEB_SOCKET_SWF_LOCATION.match(/(^|\/)WebSocketMainInsecure\.swf(\?.*)?$/) &&
+ if (!window.WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR &&
+ !WEB_SOCKET_SWF_LOCATION.match(/(^|\/)WebSocketMainInsecure\.swf(\?.*)?$/) &&
WEB_SOCKET_SWF_LOCATION.match(/^\w+:\/\/([^\/]+)/)) {
var swfHost = RegExp.$1;
if (location.host != swfHost) {
@@ -234,7 +235,8 @@
"[WebSocket] You must host HTML and WebSocketMain.swf in the same host " +
"('" + location.host + "' != '" + swfHost + "'). " +
"See also 'How to host HTML file and SWF file in different domains' section " +
- "in README.md.");
+ "in README.md. If you use WebSocketMainInsecure.swf, you can suppress this message " +
+ "by WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR = true;");
}
}
var container = document.createElement("div");