Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

diff --git a/tools/apache2/mkws-dev b/tools/apache2/mkws-dev
index d3d195f..4608c54 100644 (file)
--- a/tools/apache2/mkws-dev
+++ b/tools/apache2/mkws-dev
@@ -15,6 +15,10 @@
     DocumentRoot /home/indexdata/mkws-dev/examples/htdocs
     Alias /tools/htdocs /home/indexdata/mkws-dev/tools/htdocs
 
+    # CORS setting
+    Header set Access-Control-Allow-Credentials true
+    Header set Access-Control-Allow-Origin "*"
+
     # compress text output
     <Location />
         AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml

diff --git a/tools/apache2/mkws-test b/tools/apache2/mkws-test
index 2114884..8625691 100644 (file)
--- a/tools/apache2/mkws-test
+++ b/tools/apache2/mkws-test
@@ -15,6 +15,10 @@
     DocumentRoot /home/indexdata/mkws-test/examples/htdocs
     Alias /tools/htdocs /home/indexdata/mkws-test/tools/htdocs
 
+    # CORS setting
+    Header set Access-Control-Allow-Credentials true
+    Header set Access-Control-Allow-Origin "*"
+
     # compress text output
     <Location />
         AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index fb5e38a..12f3f71 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -77,8 +77,8 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 
 // wrapper for jQuery lib
 function _make_mkws_team($, teamName) {
-    if (console && console.log)
-       console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")");
+    // if (console && console.log) // disabled, will fail in IE8
+    // console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")");
 
     // call this function only once
     if (mkws.init) {