Move all state variable declarations together.

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index fab98c7..4579c8e 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -2,10 +2,73 @@
 
 "use strict"; // HTML5: disable for debug_level >= 2
 
+
+// Handlebars helpers
+Handlebars.registerHelper('json', function(obj) {
+    return $.toJSON(obj);
+});
+
+
+Handlebars.registerHelper('translate', function(s) {
+    debug("translating '" + s + "'");
+    return mkws.M(s);
+});
+
+
+// We need {{attr '@name'}} because Handlebars can't parse {{@name}}
+Handlebars.registerHelper('attr', function(attrName) {
+    return this[attrName];
+});
+
+
+/*
+ * Use as follows: {{#if-any NAME1 having="NAME2"}}
+ * Applicable when NAME1 is the name of an array
+ * The guarded code runs only if at least one element of the NAME1
+ * array has a subelement called NAME2.
+ */
+Handlebars.registerHelper('if-any', function(items, options) {
+    var having = options.hash.having;
+    for (var i in items) {
+       var item = items[i]
+       if (!having || item[having]) {
+           return options.fn(this);
+       }
+    }
+    return "";
+});
+
+
+Handlebars.registerHelper('first', function(items, options) {
+    var having = options.hash.having;
+    for (var i in items) {
+       var item = items[i]
+       if (!having || item[having]) {
+           return options.fn(item);
+       }
+    }
+    return "";
+});
+
+
+Handlebars.registerHelper('commaList', function(items, options) {
+    var out = "";
+
+    for (var i in items) {
+       if (i > 0) out += ", ";
+       out += options.fn(items[i])
+    }
+
+    return out;
+});
+
+
+
 // Some functions are visible to be called from outside code, namely
 // generated HTML: mkws.switchView(), showDetails(), limitTarget(),
 // limitQuery(), delimitTarget(), delimitQuery(), pagerPrev(),
-// pagerNext(), showPage()
+// pagerNext(), showPage(). Also mkws.M() is made available for the
+// Handlebars helper 'translate'
 
 
 // Set up global mkws object. Contains a hash of session objects,
@@ -91,6 +154,17 @@ function _make_mkws_team($, teamName) {
 
     var m_sort = 'relevance';
     var m_filters = [];
+    var curPage = 1;
+    var recPerPage = 20;
+    var totalRec = 0;
+    var curDetRecId = '';
+    var curDetRecData = null;
+    var submitted = false;
+    var SourceMax = 16;
+    var SubjectMax = 10;
+    var AuthorMax = 10;
+    var m_query; // initially undefined
+
 
     // keep time state for debugging
     var m_debug_time = {
@@ -99,6 +173,7 @@ function _make_mkws_team($, teamName) {
     };
 
 
+    // Needs to be defined inside _make_mkws_team() so it can see m_debug_time
     mkws.debug_function = function (string) {
        if (!mkws.debug_level)
            return;
@@ -123,65 +198,6 @@ function _make_mkws_team($, teamName) {
     debug("start running MKWS");
 
 
-    Handlebars.registerHelper('json', function(obj) {
-       return $.toJSON(obj);
-    });
-
-
-    Handlebars.registerHelper('translate', function(s) {
-       debug("translating '" + s + "'");
-       return M(s);
-    });
-
-
-    // We need {{attr '@name'}} because Handlebars can't parse {{@name}}
-    Handlebars.registerHelper('attr', function(attrName) {
-       return this[attrName];
-    });
-
-
-    /*
-     * Use as follows: {{#if-any NAME1 having="NAME2"}}
-     * Applicable when NAME1 is the name of an array
-     * The guarded code runs only if at least one element of the NAME1
-     * array has a subelement called NAME2.
-     */
-    Handlebars.registerHelper('if-any', function(items, options) {
-       var having = options.hash.having;
-       for (var i in items) {
-           var item = items[i]
-           if (!having || item[having]) {
-               return options.fn(this);
-           }
-       }
-       return "";
-    });
-
-
-    Handlebars.registerHelper('first', function(items, options) {
-       var having = options.hash.having;
-       for (var i in items) {
-           var item = items[i]
-           if (!having || item[having]) {
-               return options.fn(item);
-           }
-       }
-       return "";
-    });
-
-
-    Handlebars.registerHelper('commaList', function(items, options) {
-       var out = "";
-
-       for (var i in items) {
-           if (i > 0) out += ", ";
-           out += options.fn(items[i])
-       }
-
-       return out;
-    });
-
-
     {
 
        /* default mkws config */
@@ -269,18 +285,6 @@ function _make_mkws_team($, teamName) {
                           "showResponseType": '', // or "json" (for debugging?)
                           "onrecord": my_onrecord } );
 
-    // some state vars
-    var curPage = 1;
-    var recPerPage = 20;
-    var totalRec = 0;
-    var curDetRecId = '';
-    var curDetRecData = null;
-    var submitted = false;
-    var SourceMax = 16;
-    var SubjectMax = 10;
-    var AuthorMax = 10;
-    var m_query; // initially undefined
-
     if (!isNaN(parseInt(mkws_config.perpage_default))) {
        recPerPage = parseInt(mkws_config.perpage_default);
     }
@@ -1231,6 +1235,7 @@ function _make_mkws_team($, teamName) {
 
        return mkws.locale_lang[lang][word] || word;
     }
+    mkws.M = M; // so the Handlebars helper can use it
 
 
     // main