From: Mike Taylor Date: Fri, 22 Aug 2014 10:18:46 +0000 (+0100) Subject: mkws-core.js now also uses the mkws.pazpar2_url() API method. X-Git-Tag: 1.0.0~39^2~7^2 X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=86c87d8d1ea95bd73da0ef848476cb808b181004;p=mkws-moved-to-github.git mkws-core.js now also uses the mkws.pazpar2_url() API method. --- diff --git a/src/mkws-core.js b/src/mkws-core.js index 577d35b..abe414d 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -642,7 +642,7 @@ mkws.pazpar2_url = function() { // protocol independent 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; - log("adjusted protocol independent link to " + mkws.config.pazpar2_url); + log("adjusted protocol independent link to " + mkws.pazpar2_url()); } if (mkws.config.responsive_design_width) { @@ -699,7 +699,7 @@ mkws.pazpar2_url = function() { if (mkws.config.use_service_proxy && !mkws.authenticated && !mkws.authenticating) { authenticateSession(sp_auth_url(mkws.config), mkws.config.service_proxy_auth_domain, - mkws.config.pazpar2_url); + mkws.pazpar2_url()); } else if (!mkws.authenticating) { // raw pp2 or we have a session already open runAutoSearches();