Switch order of resetPage/redrawNavi invocations.

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index bcbb403..53d07fe 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -550,20 +550,27 @@ 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();
+       m_paz.show(0, m_perpage, m_sortOrder);
+       return false;
+    }
+
+
+    function onPerpageChange()
     {
+       m_perpage = findnode('.mkwsPerpage').val();
        if (!m_submitted) return false;
        resetPage();
-       loadSelect();
        m_paz.show(0, m_perpage, m_sortOrder);
        return false;
     }
@@ -582,23 +589,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();
+       redrawNavi();
+
        var pp2filter = "";
        var pp2limit = "";
 
@@ -649,9 +644,6 @@ function team($, teamName) {
     {
        debug("limitTarget(id=" + id + ", name=" + name + ")");
        m_filters.push({ id: id, name: name });
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -662,9 +654,6 @@ function team($, teamName) {
     {
        debug("limitQuery(field=" + field + ", value=" + value + ")");
        m_filters.push({ field: field, value: value });
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -685,9 +674,6 @@ function team($, teamName) {
        }
        m_filters = newFilters;
 
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -710,9 +696,6 @@ function team($, teamName) {
        }
        m_filters = newFilters;
 
-       redrawNavi();
-       resetPage();
-       loadSelect();
        triggerSearch();
        return false;
     }
@@ -872,10 +855,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(); });