X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=52a2270f916eb99b74792438799cab2d2c59828c;hb=d3ed2f66d323f81fbda5b562c564b3e14436ae77;hp=968ddb816c940d507181720f5a278e8bc8c0bcda;hpb=5768051540358adccb4217369be6cf5c85098e7a;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 968ddb8..52a2270 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -155,7 +155,7 @@ function team($, teamName) {
     var m_teamName = teamName;
     var m_submitted = false;
     var m_query; // initially undefined
-    var m_sort = 'relevance';
+    var m_sort; // will be set below
     var m_filters = [];
     var m_totalRec = 0;
     var m_recPerPage = 20;
@@ -260,7 +260,7 @@ function team($, teamName) {
 	debug("show");
 	m_totalRec = data.merged;
 
-	var pager = $("#mkwsPager");
+	var pager = $(".mkwsPager.mkwsTeam_" + m_teamName);
 	if (pager.length) {
 	    pager.html(drawPager(data))
 	}
@@ -420,12 +420,12 @@ function team($, teamName) {
 	    });
 	});
 
-	if (document.mkwsSelect) {
-	    if (document.mkwsSelect.mkwsSort)
-		document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
-	    if (document.mkwsSelect.mkwsPerpage)
-		document.mkwsSelect.mkwsPerpage.onchange = onSelectDdChange;
-	}
+	var node = $('.mkwsSort.mkwsTeam_' + m_teamName);
+	if (node.length)
+	    node.change(onSelectDdChange);
+	node = $('.mkwsPerpage.mkwsTeam_' + m_teamName);
+	if (node.length)
+	    node.change(onSelectDdChange);
     }
 
 
@@ -453,7 +453,7 @@ function team($, teamName) {
 	m_filters = []
 	redraw_navi();
 	resetPage(); // ### the globals it resents should be indexed by windowid
-	loadSelect(); // ### should use windowid
+	loadSelect();
 	triggerSearch(query, sort, targets, windowid);
 	that.switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
@@ -527,11 +527,15 @@ function team($, teamName) {
 
     function loadSelect ()
     {
-	if (document.mkwsSelect) {
-	    if (document.mkwsSelect.mkwsSort)
-		m_sort = document.mkwsSelect.mkwsSort.value;
-	    if (document.mkwsSelect.mkwsPerpage)
-		m_recPerPage = document.mkwsSelect.mkwsPerpage.value;
+	var node = $('.mkwsSort.mkwsTeam_' + m_teamName);
+	if (node.length && node.val() != m_sort) {
+	    debug("changing m_sort from " + m_sort + " to " + node.val());
+	    m_sort = node.val();
+	}
+	node = $('.mkwsPerpage.mkwsTeam_' + m_teamName);
+	if (node.length && node.val() != m_recPerPage) {
+	    debug("changing m_recPerPage from " + m_recPerPage + " to " + node.val());
+	    m_recPerPage = node.val();
 	}
     }
 
@@ -931,9 +935,10 @@ function team($, teamName) {
 </table>');
 	}
 
-	if ($("#mkwsRanking").length) {
+	var node = $(".mkwsRanking.mkwsTeam_" + m_teamName);
+	if (node.length) {
 	    var ranking_data = '';
-	    ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
+	    ranking_data += '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
 	    if (mkws_config.show_sort) {
 		ranking_data +=  M('Sort by') + ' ' + mkws_html_sort() + ' ';
 	    }
@@ -942,7 +947,7 @@ function team($, teamName) {
 	    }
             ranking_data += '</form>';
 
-	    $("#mkwsRanking").html(ranking_data);
+	    node.html(ranking_data);
 	}
 
 	mkws_html_switch();
@@ -1014,7 +1019,7 @@ function team($, teamName) {
 
     function mkws_html_sort() {
 	debug("HTML sort, m_sort = '" + m_sort + "'");
-	var sort_html = '<select name="mkwsSort" id="mkwsSort">';
+	var sort_html = '<select class="mkwsSort mkwsTeam_' + m_teamName + '">';
 
 	for(var i = 0; i < mkws_config.sort_options.length; i++) {
 	    var opt = mkws_config.sort_options[i];
@@ -1035,7 +1040,7 @@ function team($, teamName) {
 
     function mkws_html_perpage() {
 	debug("HTML perpage");
-	var perpage_html = '<select name="mkwsPerpage" id="mkwsPerpage">';
+	var perpage_html = '<select class="mkwsPerpage mkwsTeam_' + m_teamName + '">';
 
 	for(var i = 0; i < mkws_config.perpage_options.length; i++) {
 	    var key = mkws_config.perpage_options[i];