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://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=3cd7917e3ada63d397a128a681685c1b7cab04c1;hp=647f730f5db9be01f6424d02447101c692e4a505;p=mkws-moved-to-github.git

Merge branch 'master' into onload

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 39117da..f34d2a9 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -10,8 +10,9 @@ var mkws = {
 };
 
 // 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 lib
 function _mkws($) {
@@ -156,6 +157,7 @@ Handlebars.registerHelper('commaList', function(items, options) {
 
 
 {
+
     /* default mkws config */
     var config_default = {
 	use_service_proxy: true,
@@ -185,6 +187,12 @@ Handlebars.registerHelper('commaList', function(items, options) {
 	mkws.debug_level = config_default.debug_level;
     }
 
+    // make sure the mkws_config is a valid hash
+    if (!$.isPlainObject(mkws_config)) {
+	debug("ERROR: mkws_config is not an JS object, ignore it....");
+	mkws_config = {};
+    }
+
     /* override standard config values by function parameters */
     for (var k in config_default) {
 	if (typeof mkws_config[k] === 'undefined')