Rename mkwsStyle.css on mkws.css (on Wolfram's suggestion)

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 71daa52..74c723a 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -1,7 +1,7 @@
 /* A very simple client that shows a basic usage of the pz2.js
 */
 
-"use strict"; // HTML5: disable for debug >= 2
+"use strict"; // HTML5: disable for debug_level >= 2
 
 // Set up namespace and some state.
 var mkws = {};
@@ -22,10 +22,9 @@ if (!mkws_config)
 if (typeof mkws_config.use_service_proxy === 'undefined')
     mkws_config.use_service_proxy = true;
 
-var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
-var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "http://mkws.indexdata.com/service-proxy/";
+var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "http://mkws.indexdata.com/service-proxy/";
 
-mkws.pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
+mkws.pazpar2path = pazpar2_url;
 mkws.usesessions = mkws_config.use_service_proxy ? false : true;
 
 mkws.locale_lang = {
@@ -85,8 +84,8 @@ mkws.debug_time = {
     "start": $.now(),
     "last": $.now()
 };
-mkws.debug = function (string) {
-    if (!mkws.debug)
+mkws.debug_function = function (string) {
+    if (!mkws.debug_level)
        return;
 
     if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
@@ -98,14 +97,14 @@ mkws.debug = function (string) {
     mkws.debug_time.last = now;
 
     // you need to disable use strict at the top of the file!!!
-    if (mkws.debug >= 3) {
+    if (mkws.debug_level >= 3) {
        console.log(timestamp + arguments.callee.caller);
-    } else if (mkws.debug >= 2) {
+    } else if (mkws.debug_level >= 2) {
        console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<');
     }
     console.log(timestamp + string);
 }
-var debug = mkws.debug; // local alias
+var debug = mkws.debug_function; // local alias
 
 for (var key in mkws_config) {
     if (mkws_config.hasOwnProperty(key)) {
@@ -559,7 +558,7 @@ function mkws_html_all(config) {
 
     /* default mkws config */
     /* ### No defaults given for:
-     * lang, responsive_design, service_proxy_auth, use_service_proxy
+     * lang, service_proxy_auth, use_service_proxy
      * and of course the optional language_* entries.
      */
     var mkws_config_default = {
@@ -573,17 +572,17 @@ function mkws_html_all(config) {
        show_perpage: true,     /* show/hide perpage menu */
        lang_options: [],       /* display languages links for given languages, [] for all */
        facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
-       responsive_design_width: 980, /* a page with less pixel width considered as narrow */
-       debug: 1,     /* debug level for development: 0..2 */
+       responsive_design_width: undefined, /* a page with less pixel width considered as narrow */
+       debug_level: 1,     /* debug level for development: 0..2 */
 
        dummy: "dummy"
     };
 
-    /* set global debug flag early */
-    if (typeof config.debug !== 'undefined') {
-       mkws.debug = config.debug;
-    } else if (typeof mkws_config_default.debug !== 'undefined') {
-       mkws.debug = mkws_config_default.debug;
+    /* set global debug_level flag early */
+    if (typeof config.debug_level !== 'undefined') {
+       mkws.debug_level = config.debug_level;
+    } else if (typeof mkws_config_default.debug_level !== 'undefined') {
+       mkws.debug_level = mkws_config_default.debug_level;
     }
 
     /* override standard config values by function parameters */
@@ -661,7 +660,7 @@ function mkws_html_all(config) {
     if (mkws_config.use_service_proxy)
        mkws_service_proxy_auth(config.service_proxy_auth);
 
-    if (mkws_config.responsive_design) {
+    if (mkws_config.responsive_design_width) {
        // Responsive web design - change layout on the fly based on
        // current screen width. Required for mobile devices.
        $(window).resize( function(e) { mkws_resize_page() });
@@ -823,7 +822,7 @@ function mkws_html_lang(mkws_config) {
 function mkws_resize_page () {
     var list = ["mkwsSwitch"];
 
-    var width = mkws_config.responsive_design_width || 980;
+    var width = mkws_config.responsive_design_width;
     var parentId = $("#mkwsTermlists").parent().attr('id');
 
     if ($(window).width() <= width &&