move the default config values for "mkws" into the function()

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index cacc8d0..9b09508 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -2,12 +2,8 @@
 
 "use strict"; // HTML5: disable for debug_level >= 2
 
-// Set up namespace and some state.
-var mkws = {
-    sort: 'relevance',
-    authenticated: false,
-    filters: []
-};
+// Set up global mkws object
+var mkws = {};
 
 // Define empty mkws_config for simple applications that don't define it.
 if (mkws_config == null || typeof mkws_config != 'object') {
@@ -21,6 +17,10 @@ function _mkws($) {
     // call this function only once
     if (mkws.init) return;
 
+mkws.sort = 'relevance';
+mkws.authenticated = false;
+mkws.filters = [];
+
 mkws.locale_lang = {
     "de": {
        "Authors": "Autoren",
@@ -207,6 +207,7 @@ Handlebars.registerHelper('commaList', function(items, options) {
     }
 }
 
+
 mkws.sort = mkws_config.sort_default;
 debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to mkws.sort");
 
@@ -257,6 +258,10 @@ var SourceMax = 16;
 var SubjectMax = 10;
 var AuthorMax = 10;
 
+if (!isNaN(parseInt(mkws_config.perpage_default))) {
+    recPerPage = parseInt(mkws_config.perpage_default);
+}
+
 //
 // pz2.js event handlers:
 //