More re-ordered to draw related code together.

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b5e9908..0ab9873 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -226,17 +226,7 @@ function team($, teamName) {
     debug("start running MKWS");
 
     m_sort = mkws_config.sort_default;
-    debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to m_sort");
-
-    if (!isNaN(parseInt(mkws_config.perpage_default))) {
-       m_perpage = parseInt(mkws_config.perpage_default);
-    }
-
-    // protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
-    if (mkws_config.pazpar2_url.match(/^\/\//)) {
-       mkws_config.pazpar2_url = document.location.protocol + mkws_config.pazpar2_url;
-       debug("adjust protocol independent links: " + mkws_config.pazpar2_url);
-    }
+    m_perpage = mkws_config.perpage_default;
 
     debug("Create main pz2 object");
     // create a parameters array and pass it to the pz2's constructor
@@ -268,10 +258,8 @@ function team($, teamName) {
 
     function onBytarget(data, teamName) {
        debug("target");
-       var targetDiv = findnode('.mkwsBytarget');
-       if (!targetDiv) {
-           return;
-       }
+       var node = findnode('.mkwsBytarget');
+       if (node.length === 0) return;
 
        var table ='<table><thead><tr>' +
            '<td>' + M('Target ID') + '</td>' +
@@ -290,17 +278,16 @@ function team($, teamName) {
        }
 
        table += '</tbody></table>';
-       targetDiv.html(table);
+       node.html(table);
     }
 
 
     function onStat(data, teamName) {
        debug("stat");
-       var stat = findnode('.mkwsStat');
-       if (stat.length === 0)
-           return;
+       var node = findnode('.mkwsStat');
+       if (node.length === 0) return;
 
-       stat.html('<span class="head">' + M('Status info') + '</span>' +
+       node.html('<span class="head">' + M('Status info') + '</span>' +
            ' -- ' +
            '<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
            ' -- ' +
@@ -372,7 +359,7 @@ function team($, teamName) {
 
 
     function onRecord(data, args, teamName) {
-       debug("record: teamName=" + teamName + ", m_teamName=" + m_teamName);
+       debug("record");
        // FIXME: record is async!!
        clearTimeout(m_paz.recordTimer);
        // in case on_show was faster to redraw element
@@ -420,6 +407,60 @@ function team($, teamName) {
     }
 
 
+    function drawPager (data)
+    {
+       var s = '<div style="float: right">' + M('Displaying') + ': '
+           + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
+           ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
+           + data.total + ')</div>';
+
+       //client indexes pages from 1 but pz2 from 0
+       var onsides = 6;
+       var pages = Math.ceil(m_totalRec / m_perpage);
+
+       var firstClkbl = (m_curPage - onsides > 0)
+            ? m_curPage - onsides
+            : 1;
+
+       var lastClkbl = firstClkbl + 2*onsides < pages
+            ? firstClkbl + 2*onsides
+            : pages;
+
+       var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
+       if (m_curPage > 1)
+            prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + m_teamName + '\');">'
+            +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
+
+       var middle = '';
+       for(var i = firstClkbl; i <= lastClkbl; i++) {
+            var numLabel = i;
+            if(i == m_curPage)
+               numLabel = '<b>' + i + '</b>';
+
+            middle += '<a href="#" onclick="mkws.showPage(\'' + m_teamName + '\', ' + i + ')"> '
+               + numLabel + ' </a>';
+       }
+
+       var next = '<b> | </b><span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
+       if (pages - m_curPage > 0)
+            next = '<b> | </b><a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + m_teamName + '\')">'
+            + M('Next') + ' &#62;&#62;</a>';
+
+       var predots = '';
+       if (firstClkbl > 1)
+            predots = '...';
+
+       var postdots = '';
+       if (lastClkbl < pages)
+            postdots = '...';
+
+       s += '<div style="float: clear">'
+            + prev + predots + middle + postdots + next + '</div>';
+
+       return s;
+    }
+
+
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////////
 
@@ -630,60 +671,6 @@ function team($, teamName) {
     }
 
 
-    function drawPager (data)
-    {
-       var s = '<div style="float: right">' + M('Displaying') + ': '
-           + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
-           ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
-           + data.total + ')</div>';
-
-       //client indexes pages from 1 but pz2 from 0
-       var onsides = 6;
-       var pages = Math.ceil(m_totalRec / m_perpage);
-
-       var firstClkbl = (m_curPage - onsides > 0)
-            ? m_curPage - onsides
-            : 1;
-
-       var lastClkbl = firstClkbl + 2*onsides < pages
-            ? firstClkbl + 2*onsides
-            : pages;
-
-       var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
-       if (m_curPage > 1)
-            prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + m_teamName + '\');">'
-            +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
-
-       var middle = '';
-       for(var i = firstClkbl; i <= lastClkbl; i++) {
-            var numLabel = i;
-            if(i == m_curPage)
-               numLabel = '<b>' + i + '</b>';
-
-            middle += '<a href="#" onclick="mkws.showPage(\'' + m_teamName + '\', ' + i + ')"> '
-               + numLabel + ' </a>';
-       }
-
-       var next = '<b> | </b><span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
-       if (pages - m_curPage > 0)
-            next = '<b> | </b><a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + m_teamName + '\')">'
-            + M('Next') + ' &#62;&#62;</a>';
-
-       var predots = '';
-       if (firstClkbl > 1)
-            predots = '...';
-
-       var postdots = '';
-       if (lastClkbl < pages)
-            postdots = '...';
-
-       s += '<div style="float: clear">'
-            + prev + predots + middle + postdots + next + '</div>';
-
-       return s;
-    }
-
-
     that.showPage = function (pageNum)
     {
        m_curPage = pageNum;
@@ -1432,6 +1419,12 @@ function team($, teamName) {
            $(document).ready(function() { mkws.resizePage() });
        }
 
+       // protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
+       if (mkws_config.pazpar2_url.match(/^\/\//)) {
+           mkws_config.pazpar2_url = document.location.protocol + mkws_config.pazpar2_url;
+           debug("adjust protocol independent links: " + mkws_config.pazpar2_url);
+       }
+
        // Backwards compatibility: set new magic class names on any
        // elements that have the old magic IDs.
        var ids = [ "Switch", "Lang", "Search", "Pager", "Navi",