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 9b7d65c..6d03d07 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -184,8 +184,6 @@ function widget($, team, type, node) {
 
     function promoteTargets() {
        team.queue("targets").subscribe(function(data) {
-           if (node.length === 0) alert("huh?!");
-
            var table ='<table><thead><tr>' +
                '<td>' + M('Target ID') + '</td>' +
                '<td>' + M('Hits') + '</td>' +
@@ -552,28 +550,29 @@ 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;
     }
 
 
-    function onSelectDdChange()
+    function onSortChange()
     {
+       m_sortOrder = findnode('.mkwsSort').val();
        if (!m_submitted) return false;
        resetPage();
-       loadSelect();
        m_paz.show(0, m_perpage, m_sortOrder);
        return false;
     }
 
 
-    function redrawNavi ()
+    function onPerpageChange()
     {
-       queue("navi").publish();
+       m_perpage = findnode('.mkwsPerpage').val();
+       if (!m_submitted) return false;
+       resetPage();
+       m_paz.show(0, m_perpage, m_sortOrder);
+       return false;
     }
 
 
@@ -584,23 +583,11 @@ function team($, teamName) {
     }
 
 
-    function loadSelect ()
-    {
-       var node = findnode('.mkwsSort');
-       if (node.length && node.val() != m_sortOrder) {
-           debug("changing m_sortOrder from " + m_sortOrder + " to " + node.val());
-           m_sortOrder = node.val();
-       }
-       node = findnode('.mkwsPerpage');
-       if (node.length && node.val() != m_perpage) {
-           debug("changing m_perpage from " + m_perpage + " to " + node.val());
-           m_perpage = node.val();
-       }
-    }
-
-
     function triggerSearch (query, sortOrder, targets)
     {
+       resetPage();
+       queue("navi").publish();
+
        var pp2filter = "";
        var pp2limit = "";
 
@@ -651,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;
     }
@@ -664,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;
     }
@@ -687,9 +668,6 @@ function team($, teamName) {
        }
        m_filters = newFilters;
 
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -712,9 +690,6 @@ function team($, teamName) {
        }
        m_filters = newFilters;
 
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -874,10 +849,10 @@ function team($, teamName) {
            node.submit(onFormSubmitEventHandler);
        node = findnode('.mkwsSort');
        if (node.length)
-           node.change(onSelectDdChange);
+           node.change(onSortChange);
        node = findnode('.mkwsPerpage');
        if (node.length)
-           node.change(onSelectDdChange);
+           node.change(onPerpageChange);
 
        // on first page, hide the termlist
        $(document).ready(function() { findnode(".mkwsTermlists").hide(); });