add english language link again

[mkws-moved-to-github.git] / experiments / spclient / mkws.js

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 4a6eb6d..cf2c7dd 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -449,10 +449,10 @@ function renderDetails(data, marker)
  * All the HTML stuff to render the search forms and
  * result pages.
  */
-function mkws_html_all(data) {
+function mkws_html_all(config) {
 
-    /* default config */
-    var config = {
+    /* default mkws config */
+    var mkws_config_default = {
        sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
        perpage: [10, 20, 30, 50],
        sort_default: "relevance",
@@ -468,17 +468,19 @@ function mkws_html_all(data) {
     };
 
     /* set global debug flag early */
-    if (data.debug !== 'undefined') {
-       mkws_debug = data.debug;
-    } else if (config.debug !== 'undefined') {
+    if (config.debug !== 'undefined') {
        mkws_debug = config.debug;
+    } else if (mkws_config_default.debug !== 'undefined') {
+       mkws_debug = mkws_config_default.debug;
     }
     
     /* override standard config values by function parameters */
-    for (var k in config) {
-       mkws_config[k] = config[k];
-       debug("Set config: " + k + ' => ' + config[k]);
+    for (var k in mkws_config_default) {
+       if (typeof config[k] === 'undefined')
+          mkws_config[k] = mkws_config_default[k];
+       debug("Set config: " + k + ' => ' + mkws_config[k]);
     }
+
     if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
        debug("Reset query width: " + mkws_config.query_width);
        mkws_config.query_width = 50;
@@ -644,13 +646,15 @@ function mkws_html_lang(mkws_config) {
        hash[lang_display[i]] = 1;
     }
     
-    if (hash[lang_default] == 1)
-       list.push(lang_default);
-
     for (var k in mkws_locale_lang) {
-       if (hash[k] == 1 || lang_display.length == 0)
+       if (hash[k] == 1)
            list.push(k);
     }
+
+    // add english link
+    if (lang_display.length == 0 || hash[lang_default] == 1)
+        list.push(lang_default);
+
     debug("Language menu for: " + list.join(", "));
 
     /* the HTML part */
@@ -698,7 +702,7 @@ function debug(string) {
     if (!mkws_debug)
        return;
 
-    if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! */
+    if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
        return;
     }