Page element selection is done by jQuery.

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 6ef2d5c..f5a1a9e 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -259,15 +259,10 @@ function team($, teamName) {
     function my_onshow(data, teamName) {
        debug("show");
        m_totalRec = data.merged;
-       // move it out
-       var pager = document.getElementById("mkwsPager");
-       if (pager) {
-           pager.innerHTML = "";
-           pager.innerHTML +='<div style="float: right">' + M('Displaying') + ': '
-               + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
-               ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
-               + data.total + ')</div>';
-           drawPager(pager);
+
+       var pager = $("#mkwsPager");
+       if (pager.length) {
+           drawPager(pager, data);
        }
 
        // navi
@@ -426,7 +421,6 @@ function team($, teamName) {
        });
 
        if (document.mkwsSelect) {
-           debug("messing with mkwsSelect");
            if (document.mkwsSelect.mkwsSort)
                document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
            if (document.mkwsSelect.mkwsPerpage)
@@ -641,8 +635,13 @@ function team($, teamName) {
     }
 
 
-    function drawPager (pagerDiv)
+    function drawPager (pagerDiv, 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_recPerPage);
@@ -683,8 +682,9 @@ function team($, teamName) {
        if (lastClkbl < pages)
             postdots = '...';
 
-       pagerDiv.innerHTML += '<div style="float: clear">'
+       s += '<div style="float: clear">'
             + prev + predots + middle + postdots + next + '</div>';
+       pagerDiv.html(s);
     }
 
 
@@ -954,15 +954,12 @@ function team($, teamName) {
            $(document).ready(function() { mkws.resize_page() });
        }
 
-       debug("before domReady()");
        domReady();
-       debug("after domReady()");
 
        // on first page, hide the termlist
        $(document).ready(function() { $(".mkwsTermlists.mkwsTeam_" + m_teamName).hide(); });
        var motd = $(".mkwsMOTD.mkwsTeam_" + m_teamName);
        var container = $(".mkwsMOTDContainer.mkwsTeam_" + m_teamName);
-       debug("for team '" + m_teamName + "', motd=" + motd + "(" + motd.length + "), container=" + container + "(" + container.length + ")");
        if (motd.length && container.length) {
            // Move the MOTD from the provided element down into the container
            motd.appendTo(container);
@@ -1492,9 +1489,7 @@ function _mkws_jquery_plugin ($) {
        $('[class^="mkws"],[class*=" mkws"]').each(function () {
            var node = this;
            mkws.handle_node_with_team(node, function(tname) {
-               if (mkws.teams[tname]) {
-                   log("MKWS team '" + tname + "' already exists, skipping");
-               } else {
+               if (!mkws.teams[tname]) {
                    mkws.teams[tname] = team(j, tname);
                    log("Made MKWS team '" + tname + "'");
                }