From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 3 Jan 2014 15:16:33 +0000 (+0000)
Subject: Merge branch 'master' into onload
X-Git-Tag: 1.0.0~1747^2~1
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=3cd7917e3ada63d397a128a681685c1b7cab04c1;p=mkws-moved-to-github.git

Merge branch 'master' into onload

Conflicts:
	tools/htdocs/mkws.js
---

3cd7917e3ada63d397a128a681685c1b7cab04c1
diff --cc tools/htdocs/mkws.js
index 39117da,5ea0ce9..f34d2a9
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@@ -9,16 -9,18 +9,17 @@@ var mkws = 
      filters: []
  };
  
 -/*
 - * global config object: mkws_config
 - *
 - * Needs to be defined in the HTML header before including this JS file.
 - * Define empty mkws_config for simple applications that don't define it.
 - */
 +// Define empty mkws_config for simple applications that don't define it.
- if (!mkws_config)
+ if (mkws_config == null || typeof mkws_config != 'object') {
      var mkws_config = {};
+ }
  
 -// Wrapper for jQuery
 -(function ($) {
 +// wrapper for jQuery lib
 +function _mkws($) {
 +    // if (console && console.log) console.log("run _mkws()");
 +
 +    // call this function only once
 +    if (mkws.init) return;
  
  mkws.locale_lang = {
      "de": {