Use child-counting to find Targets and Records links.

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index d4e8166..08b7862 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -141,7 +141,7 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 
 
 // wrapper for jQuery lib
-function _make_mkws_team($, teamName) {
+function team($, teamName) {
     var that = {};
     var m_teamName = teamName;
     var m_submitted = false;
@@ -162,10 +162,11 @@ function _make_mkws_team($, teamName) {
 
 
     // if (console && console.log) // disabled, will fail in IE8
-    // console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")");
+    // console.log("run team(" + (teamName ? teamName : "") + ")");
 
 
-    // Needs to be defined inside _make_mkws_team() so it can see m_debug_time
+    // Needs to be defined inside team() so it can see m_debug_time
+    // ### member access won't work: there is only one instance of this function
     mkws.debug_function = function (string) {
        if (!mkws.debug_level)
            return;
@@ -270,7 +271,8 @@ function _make_mkws_team($, teamName) {
                      renderSummary(hit),
                      '</div>');
            if (hit.recid == m_curDetRecId) {
-               html.push(renderDetails(m_curDetRecData));
+               if (m_curDetRecData)
+                   html.push(renderDetails(m_curDetRecData));
            }
        }
        results.html(html.join(''));
@@ -355,7 +357,7 @@ function _make_mkws_team($, teamName) {
     }
 
 
-    function my_onrecord(data, teamName) {
+    function my_onrecord(data, args, teamName) {
        debug("record for " + teamName);
        // FIXME: record is async!!
        clearTimeout(m_paz.recordTimer);
@@ -371,7 +373,7 @@ function _make_mkws_team($, teamName) {
 
     function my_onbytarget(data, teamName) {
        debug("target for " + teamName);
-       var targetDiv = document.getElementById("mkwsBytarget");
+       var targetDiv = $('.mkwsBytarget.mkwsTeam_' + teamName);
        if (!targetDiv) {
            // No mkwsTargets div.
            return;
@@ -394,7 +396,7 @@ function _make_mkws_team($, teamName) {
        }
 
        table += '</tbody></table>';
-       targetDiv.innerHTML = table;
+       targetDiv.html(table);
     }
 
     ////////////////////////////////////////////////////////////////////////////////
@@ -404,10 +406,11 @@ function _make_mkws_team($, teamName) {
     // wait until the DOM is ready
     function domReady ()
     {
-       $('.mkwsSearchForm').each(function (i, obj) {
+       $('.mkwsSearchForm.mkwsTeam_' + m_teamName).each(function (i, obj) {
+           debug("adding search-forms for team '" + m_teamName + "'");
            var node = this;
-           debug("adding class 'foo' to node " + node);
            mkws.handle_node_with_team(node, function(tname) {
+               debug("adding search-form '" + tname + "' for team '" + m_teamName + "'");
                $(node).submit(onFormSubmitEventHandler);
            });
        });
@@ -425,7 +428,11 @@ function _make_mkws_team($, teamName) {
     // when search button pressed
     function onFormSubmitEventHandler()
     {
-       that.newSearch(document.mkwsSearchForm.mkwsQuery.value);
+       mkws.handle_node_with_team(this, function (tname) {
+           var val = $('.mkwsQuery.mkwsTeam_' + tname).val();
+           mkws.teams[tname].newSearch(val);
+       });
+
        return false;
     }
 
@@ -697,30 +704,31 @@ function _make_mkws_team($, teamName) {
     mkws.switchView = function(view) {
        debug("switchView: " + view);
 
-       var targets = document.getElementById('mkwsTargets');
-       var results = document.getElementById('mkwsResults') ||
-           document.getElementById('mkwsRecords');
-       var blanket = document.getElementById('mkwsBlanket');
-       var motd    = document.getElementById('mkwsMOTD');
+       //var targets = document.getElementById('mkwsTargets');
+       var targets = $('#mkwsTargets');
+       var results = $('#mkwsResults,#mkwsRecords');
+       var blanket = $('#mkwsBlanket');
+       var motd    = $('#mkwsMOTD');
 
        switch(view) {
         case 'targets':
-            if (targets) targets.style.display = "block";
-            if (results) results.style.display = "none";
-            if (blanket) blanket.style.display = "none";
-            if (motd) motd.style.display = "none";
+            if (targets) targets.css('display', 'block');
+            if (results) results.css('display', 'none');
+            if (blanket) blanket.css('display', 'none');
+            if (motd) motd.css('display', 'none');
             break;
         case 'records':
-            if (targets) targets.style.display = "none";
-            if (results) results.style.display = "block";
-            if (blanket) blanket.style.display = "block";
-            if (motd) motd.style.display = "none";
+            if (targets) targets.css('display', 'none');
+            if (results) results.css('display', 'block');
+            if (blanket) blanket.css('display', 'block');
+            if (motd) motd.css('display', 'none');
             break;
        case 'none':
-            if (targets) targets.style.display = "none";
-            if (results) results.style.display = "none";
-            if (blanket) blanket.style.display = "none";
-            if (motd) motd.style.display = "none";
+           alert("mkws.switchView('none') shouldn't happen");
+            if (targets) targets.css('display', 'none');
+            if (results) results.css('display', 'none');
+            if (blanket) blanket.css('display', 'none');
+            if (motd) motd.css('display', 'none');
             break;
         default:
             alert("Unknown view '" + view + "'");
@@ -977,18 +985,20 @@ function _make_mkws_team($, teamName) {
 
 
     function mkws_html_switch() {
-       debug("HTML switch");
+       debug("HTML switch for team " + m_teamName);
 
-       $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_records" onclick="mkws.switchView(\'records\')">' + M('Records') + '</a>'));
-       $("#mkwsSwitch").append($("<span/>", { text: " | " }));
-       $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_targets" onclick="mkws.switchView(\'targets\')">' + M('Targets') + '</a>'));
+       var node = $(".mkwsSwitch.mkwsTeam_" + m_teamName);
+       node.append($('<a href="#" class="mkwsSwitch_records" onclick="mkws.switchView(\'records\')">' + M('Records') + '</a>'));
+       node.append($("<span/>", { text: " | " }));
+       node.append($('<a href="#" class="mkwsSwitch_targets" onclick="mkws.switchView(\'targets\')">' + M('Targets') + '</a>'));
 
        debug("HTML targets");
-       $("#mkwsTargets").html('\
-<div id="mkwsBytarget" class="mkwsBytarget mkwsTeam_AUTO">\
+       var node = $(".mkwsTargets.mkwsTeam_" + m_teamName);
+       node.html('\
+<div class="mkwsBytarget mkwsTeam_' + m_teamName + '">\
   No information available yet.\
 </div>');
-       $("#mkwsTargets").css("display", "none");
+       node.css("display", "none");
     }
 
 
@@ -1088,7 +1098,7 @@ function _make_mkws_team($, teamName) {
            $("#mkwsTermlistContainer1").hide();
            $("#mkwsTermlistContainer2").show();
            for(var i = 0; i < list.length; i++) {
-               $("#" + list[i]).hide();
+               $("#" + list[i]).hide(); // ### make team-aware
            }
        } else if ($(window).width() > width &&
                   parentId === "mkwsTermlistContainer2") {
@@ -1097,7 +1107,7 @@ function _make_mkws_team($, teamName) {
            $("#mkwsTermlistContainer1").show();
            $("#mkwsTermlistContainer2").hide();
            for(var i = 0; i < list.length; i++) {
-               $("#" + list[i]).show();
+               $("#" + list[i]).show(); // ### make team-aware
            }
        }
     };
@@ -1276,7 +1286,7 @@ function _mkws_jquery_plugin ($) {
 };
 
 
-// wrapper to call _make_mkws_team() after page load
+// wrapper to call team() after page load
 (function (j) {
     function log(s) {
         if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
@@ -1315,7 +1325,7 @@ function _mkws_jquery_plugin ($) {
                if (mkws.teams[tname]) {
                    log("MKWS team '" + tname + "' already exists, skipping");
                } else {
-                   mkws.teams[tname] = _make_mkws_team(j, tname);
+                   mkws.teams[tname] = team(j, tname);
                    log("Made MKWS team '" + tname + "'");
                }
            });