redrawNavi was a one-line function invoked in only one place.

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 5ea64a0..6d03d07 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -550,9 +550,6 @@ function team($, teamName) {
        }
 
        m_filters = []
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch(query, sortOrder, targets);
        switchView('records'); // In case it's configured to start off as hidden
        m_submitted = true;
@@ -564,7 +561,6 @@ function team($, teamName) {
        m_sortOrder = findnode('.mkwsSort').val();
        if (!m_submitted) return false;
        resetPage();
-       loadSelect();
        m_paz.show(0, m_perpage, m_sortOrder);
        return false;
     }
@@ -575,18 +571,11 @@ function team($, teamName) {
        m_perpage = findnode('.mkwsPerpage').val();
        if (!m_submitted) return false;
        resetPage();
-       loadSelect();
        m_paz.show(0, m_perpage, m_sortOrder);
        return false;
     }
 
 
-    function redrawNavi ()
-    {
-       queue("navi").publish();
-    }
-
-
     function resetPage()
     {
        m_currentPage = 1;
@@ -594,21 +583,11 @@ function team($, teamName) {
     }
 
 
-    function loadSelect ()
-    {
-       var node = findnode('.mkwsSort');
-       if (node.length && node.val() != m_sortOrder) {
-           alert("m_sortOrder '" + m_sortOrder + "' != node.val() '" + node.val() + "'");
-       }
-       node = findnode('.mkwsPerpage');
-       if (node.length && node.val() != m_perpage) {
-           alert("m_perpage '" + m_perpage + "' != node.val() '" + node.val() + "'");
-       }
-    }
-
-
     function triggerSearch (query, sortOrder, targets)
     {
+       resetPage();
+       queue("navi").publish();
+
        var pp2filter = "";
        var pp2limit = "";
 
@@ -659,9 +638,6 @@ function team($, teamName) {
     {
        debug("limitTarget(id=" + id + ", name=" + name + ")");
        m_filters.push({ id: id, name: name });
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -672,9 +648,6 @@ function team($, teamName) {
     {
        debug("limitQuery(field=" + field + ", value=" + value + ")");
        m_filters.push({ field: field, value: value });
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -695,9 +668,6 @@ function team($, teamName) {
        }
        m_filters = newFilters;
 
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -720,9 +690,6 @@ function team($, teamName) {
        }
        m_filters = newFilters;
 
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }