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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 48780b5..0766f51 100644
--- 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,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;
     }
@@ -584,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 = "";
 
@@ -651,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;
     }
@@ -664,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;
     }
@@ -687,9 +674,6 @@ function team($, teamName) {
 	}
 	m_filters = newFilters;
 
-	redrawNavi();
-	resetPage();
-	loadSelect();
 	triggerSearch();
 	return false;
     }
@@ -712,9 +696,6 @@ function team($, teamName) {
 	}
 	m_filters = newFilters;
 
-	redrawNavi();
-	resetPage();
-	loadSelect();
 	triggerSearch();
 	return false;
     }
@@ -874,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(); });
@@ -1515,7 +1496,7 @@ function team($, teamName) {
 	// Second pass: make the individual widget objects. This has
 	// to be done separately, and after the team-creation, since
 	// that sometimes makes new widget nodes (e.g. creating
-	// mkwsTermlists instead mkwsResults.
+	// mkwsTermlists inside mkwsResults.
 	$('[class^="mkws"],[class*=" mkws"]').each(function () {
 	    mkws.handleNodeWithTeam(this, function(tname, type) {
 		var myTeam = mkws.teams[tname];