projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 758eff5)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Thu, 23 Jan 2014 10:16:03 +0000 (10:16 +0000)
committerMike Taylor <mike@indexdata.com>
Thu, 23 Jan 2014 10:16:03 +0000 (10:16 +0000)
examples/htdocs/jasmine-popup.html patch | blob | history
examples/htdocs/jasmine.html patch | blob | history
tools/htdocs/mkws.js patch | blob | history

diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 305b728..9150efe 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -28,6 +28,10 @@
 
   <body>
     <script type="text/javascript">
+    var mkws_config = {
+      pazpar2_url:          "//mkws.indexdata.com/service-proxy/",
+      service_proxy_auth:   "//mkws.indexdata.com/service-proxy-auth"
+    };
 
     jQuery.pazpar2({
         "layout": "popup",               /* "table" [default], "div", "popup" */
diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index 1f5ac7c..84c2083 100644 (file)
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -5,8 +5,8 @@
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
-         pazpar2_url : "https://mkws.indexdata.com/service-proxy/",
-         service_proxy_auth: "https://mkws.indexdata.com/service-proxy-auth",
+         pazpar2_url : "//mkws.indexdata.com/service-proxy/",
+         service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth",
          perpage_default: 10
       };
     </script>
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 439ee36..b8a92a7 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -237,6 +237,12 @@ for (var key in mkws_config) {
     }
 }
 
+// protocol independend link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
+if (mkws_config.pazpar2_url.match(/^\/\//)) {
+    mkws_config.pazpar2_url = document.location.protocol + mkws_config.pazpar2_url;
+    debug("adjust protocol independend links: " + mkws_config.pazpar2_url);
+}
+
 debug("Create main pz2 object");
 // create a parameters array and pass it to the pz2's constructor
 // then register the form submit event with the pz2.search function
@@ -1084,7 +1090,7 @@ function mkws_service_proxy_auth(auth_url, auth_domain, pp2_url) {
     debug("Run service proxy auth URL: " + auth_url);
 
     if (!auth_domain) {
-       auth_domain = pp2_url.replace(/^https?:\/\/(.*?)\/.*/, '$1');
+       auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2');
        debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
     }
 
MasterKey Widget Set