Remove immediately-overridden initial value of m_sort.

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 12c4773..52a2270 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -155,7 +155,7 @@ function team($, teamName) {
     var m_teamName = teamName;
     var m_submitted = false;
     var m_query; // initially undefined
-    var m_sort = 'relevance';
+    var m_sort; // will be set below
     var m_filters = [];
     var m_totalRec = 0;
     var m_recPerPage = 20;
@@ -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.mkwsTeam_" + m_teamName);
+       if (pager.length) {
+           pager.html(drawPager(data))
        }
 
        // navi
@@ -425,13 +420,12 @@ function team($, teamName) {
            });
        });
 
-       if (document.mkwsSelect) {
-           debug("messing with mkwsSelect");
-           if (document.mkwsSelect.mkwsSort)
-               document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
-           if (document.mkwsSelect.mkwsPerpage)
-               document.mkwsSelect.mkwsPerpage.onchange = onSelectDdChange;
-       }
+       var node = $('.mkwsSort.mkwsTeam_' + m_teamName);
+       if (node.length)
+           node.change(onSelectDdChange);
+       node = $('.mkwsPerpage.mkwsTeam_' + m_teamName);
+       if (node.length)
+           node.change(onSelectDdChange);
     }
 
 
@@ -459,9 +453,9 @@ function team($, teamName) {
        m_filters = []
        redraw_navi();
        resetPage(); // ### the globals it resents should be indexed by windowid
-       loadSelect(); // ### should use windowid
+       loadSelect();
        triggerSearch(query, sort, targets, windowid);
-       mkws.switchView(m_teamName, 'records'); // In case it's configured to start off as hidden
+       that.switchView('records'); // In case it's configured to start off as hidden
        m_submitted = true;
     }
 
@@ -533,11 +527,15 @@ function team($, teamName) {
 
     function loadSelect ()
     {
-       if (document.mkwsSelect) {
-           if (document.mkwsSelect.mkwsSort)
-               m_sort = document.mkwsSelect.mkwsSort.value;
-           if (document.mkwsSelect.mkwsPerpage)
-               m_recPerPage = document.mkwsSelect.mkwsPerpage.value;
+       var node = $('.mkwsSort.mkwsTeam_' + m_teamName);
+       if (node.length && node.val() != m_sort) {
+           debug("changing m_sort from " + m_sort + " to " + node.val());
+           m_sort = node.val();
+       }
+       node = $('.mkwsPerpage.mkwsTeam_' + m_teamName);
+       if (node.length && node.val() != m_recPerPage) {
+           debug("changing m_recPerPage from " + m_recPerPage + " to " + node.val());
+           m_recPerPage = node.val();
        }
     }
 
@@ -641,8 +639,13 @@ function team($, teamName) {
     }
 
 
-    function drawPager (pagerDiv)
+    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_recPerPage);
@@ -683,8 +686,10 @@ function team($, teamName) {
        if (lastClkbl < pages)
             postdots = '...';
 
-       pagerDiv.innerHTML += '<div style="float: clear">'
+       s += '<div style="float: clear">'
             + prev + predots + middle + postdots + next + '</div>';
+
+       return s;
     }
 
 
@@ -711,13 +716,11 @@ function team($, teamName) {
 
 
     // switching view between targets and records
-    mkws.switchView = function(tname, view) {
-       debug("switchView(" + tname + ", " + view + ")");
-
-       var targets = $('.mkwsTargets.mkwsTeam_' + tname);
-       var results = $('.mkwsResults.mkwsTeam_' + tname + ',.mkwsRecords.mkwsTeam_' + tname);
-       var blanket = $('.mkwsBlanket.mkwsTeam_' + tname);
-       var motd    = $('.mkwsMOTD.mkwsTeam_' + tname);
+    that.switchView = function(view) {
+       var targets = $('.mkwsTargets.mkwsTeam_' + m_teamName);
+       var results = $('.mkwsResults.mkwsTeam_' + m_teamName + ',.mkwsRecords.mkwsTeam_' + m_teamName);
+       var blanket = $('.mkwsBlanket.mkwsTeam_' + m_teamName);
+       var motd    = $('.mkwsMOTD.mkwsTeam_' + m_teamName);
 
        switch(view) {
         case 'targets':
@@ -733,7 +736,7 @@ function team($, teamName) {
             if (motd) motd.css('display', 'none');
             break;
        case 'none':
-           alert("mkws.switchView(" + tname + ", 'none') shouldn't happen");
+           alert("mkws.switchView(" + m_teamName + ", 'none') shouldn't happen");
             if (targets) targets.css('display', 'none');
             if (results) results.css('display', 'none');
             if (blanket) blanket.css('display', 'none');
@@ -932,9 +935,10 @@ function team($, teamName) {
 </table>');
        }
 
-       if ($("#mkwsRanking").length) {
+       var node = $(".mkwsRanking.mkwsTeam_" + m_teamName);
+       if (node.length) {
            var ranking_data = '';
-           ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
+           ranking_data += '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
            if (mkws_config.show_sort) {
                ranking_data +=  M('Sort by') + ' ' + mkws_html_sort() + ' ';
            }
@@ -943,7 +947,7 @@ function team($, teamName) {
            }
             ranking_data += '</form>';
 
-           $("#mkwsRanking").html(ranking_data);
+           node.html(ranking_data);
        }
 
        mkws_html_switch();
@@ -956,15 +960,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);
@@ -1018,7 +1019,7 @@ function team($, teamName) {
 
     function mkws_html_sort() {
        debug("HTML sort, m_sort = '" + m_sort + "'");
-       var sort_html = '<select name="mkwsSort" id="mkwsSort">';
+       var sort_html = '<select class="mkwsSort mkwsTeam_' + m_teamName + '">';
 
        for(var i = 0; i < mkws_config.sort_options.length; i++) {
            var opt = mkws_config.sort_options[i];
@@ -1039,7 +1040,7 @@ function team($, teamName) {
 
     function mkws_html_perpage() {
        debug("HTML perpage");
-       var perpage_html = '<select name="mkwsPerpage" id="mkwsPerpage">';
+       var perpage_html = '<select class="mkwsPerpage mkwsTeam_' + m_teamName + '">';
 
        for(var i = 0; i < mkws_config.perpage_options.length; i++) {
            var key = mkws_config.perpage_options[i];
@@ -1331,6 +1332,10 @@ function _mkws_jquery_plugin ($) {
     };
 
 
+    mkws.switchView = function(tname, view) {
+       mkws.teams[tname].switchView(view);
+    }
+
     mkws.showDetails = function (tname, prefixRecId) {
        mkws.teams[tname].showDetails(prefixRecId);
     }
@@ -1490,9 +1495,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 + "'");
                }