switchView() now works entirely using jQuery

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index c6e5797..56d3522 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -271,7 +271,8 @@ function 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(''));
@@ -405,10 +406,11 @@ function 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);
            });
        });
@@ -426,7 +428,11 @@ function 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;
     }
 
@@ -698,30 +704,31 @@ function 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 + "'");