From a71f371861dc0c19002ae7ecf8ce6dd60bc5f259 Mon Sep 17 00:00:00 2001 From: Hiroshi Ichikawa Date: Sun, 7 Aug 2011 13:04:04 +0900 Subject: Adding flag WEB_SOCKET_SUPPRESS_CROSS_DOMAIN_SWF_ERROR in case the user rename WebSocketMainInsecure.swf. --- web_socket.js | 6 ++++-- 1 file 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"); -- cgit v1.2.1