X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=73437496afb4f46add4adf2b6d3847bfb18401f8;hb=7df213947f66e078f3ac244fb4a7512c4410cd3f;hp=0dc511f8b8c2796be06e1810a4e611dcafe29159;hpb=f4c6376a61aecffd7c003f68d0734688b5692a79;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 0dc511f..7343749 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -1084,7 +1084,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(/^http:\/\/(.*?)\/.*/, '$1'); + auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2'); debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'"); } @@ -1210,9 +1210,16 @@ function M(word) { * implement jQuery plugin $.pazpar2({}) */ function _mkws_jquery_plugin ($) { - // delayed debug, internal variables are set after dom ready + var debug_level = 1; + function debug (string) { - setTimeout(function() { mkws.debug_function(string); }, 500); + if (!debug_level) + return; + + if (typeof console === "undefined" || typeof console.log === "undefined") + return; + + console.log("jquery.pazpar2: " + string); } function init_popup(obj) {