From: Mike Taylor <mike@indexdata.com>
Date: Wed, 22 Jan 2014 15:54:06 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~1668
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=758eff59c297d8ec0fe709b63d6612729abdc7a8;hp=-c;p=mkws-moved-to-github.git

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

758eff59c297d8ec0fe709b63d6612729abdc7a8
diff --combined tools/htdocs/mkws.js
index 725754b,4df6f70..439ee36
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@@ -14,12 -14,12 +14,12 @@@ if (mkws_config == null || typeof mkws_
  }
  
  // wrapper for jQuery lib
 -function _mkws($) {
 -    // if (console && console.log) console.log("run _mkws()");
 +function _make_mkws_team($) {
 +    // if (console && console.log) console.log("run _make_mkws_team()");
  
      // call this function only once
      if (mkws.init) {
 -	alert("_mkws() called twice: how did that happen?!");
 +	alert("_make_mkws_team() called twice: how did that happen?!");
  	return;
      }
  
@@@ -1084,7 -1084,7 +1084,7 @@@ function mkws_service_proxy_auth(auth_u
      debug("Run service proxy auth URL: " + auth_url);
  
      if (!auth_domain) {
- 	auth_domain = pp2_url.replace(/^http:\/\/(.*?)\/.*/, '$1');
+ 	auth_domain = pp2_url.replace(/^https?:\/\/(.*?)\/.*/, '$1');
  	debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
      }
  
@@@ -1347,13 -1347,13 +1347,13 @@@ function _mkws_jquery_plugin ($) 
  });
  };
  
 -// wrapper to call _mkws after page load
 +// wrapper to call _make_mkws_team() after page load
  (function (j) {
      // enable before page load, so we could call it before mkws() runs
      _mkws_jquery_plugin(j);
  
      $(document).ready(function() {
  	// if (console && console.log) console.log("on load ready");
 -	_mkws(j);
 +	_make_mkws_team(j);
      });
  })(jQuery);