X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=0766f51867d31becf31881ddd33f01191a93f774;hb=9d30056b825036d1ff7c6ad324a9218e642b2010;hp=32be2c7bbf51a8943f7f3d1a5c4387ee5be04670;hpb=212d3cd70d1379ba08272b97a8414ffaadbb4e72;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 32be2c7..0766f51 100644
--- 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;
@@ -561,9 +558,9 @@ function team($, teamName) {
 
     function onSortChange()
     {
+	m_sortOrder = findnode('.mkwsSort').val();
 	if (!m_submitted) return false;
 	resetPage();
-	loadSelect();
 	m_paz.show(0, m_perpage, m_sortOrder);
 	return false;
     }
@@ -571,9 +568,9 @@ function team($, teamName) {
 
     function onPerpageChange()
     {
+	m_perpage = findnode('.mkwsPerpage').val();
 	if (!m_submitted) return false;
 	resetPage();
-	loadSelect();
 	m_paz.show(0, m_perpage, m_sortOrder);
 	return false;
     }
@@ -592,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)
     {
+	redrawNavi();
+	resetPage();
+
 	var pp2filter = "";
 	var pp2limit = "";
 
@@ -659,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;
     }
@@ -672,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;
     }
@@ -695,9 +674,6 @@ function team($, teamName) {
 	}
 	m_filters = newFilters;
 
-	redrawNavi();
-	resetPage();
-	loadSelect();
 	triggerSearch();
 	return false;
     }
@@ -720,9 +696,6 @@ function team($, teamName) {
 	}
 	m_filters = newFilters;
 
-	redrawNavi();
-	resetPage();
-	loadSelect();
 	triggerSearch();
 	return false;
     }