X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=e9da39d6fcdc323c77e83775985e47ba9a7a704e;hb=2ff86cfc8d8fd83b34a8600f3e7bc0a4e0da60d3;hp=08ffb8ac26170976c9e3c06734857b3d7d0629be;hpb=7230df2f7e91720f6e561420b9e9b6dcccad1796;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 08ffb8a..e9da39d 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -155,10 +155,10 @@ 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_perpage; // will be set below
     var m_filters = [];
     var m_totalRec = 0;
-    var m_recPerPage = 20;
     var m_curPage = 1;
     var m_curDetRecId = '';
     var m_curDetRecData = null;
@@ -242,7 +242,7 @@ function team($, teamName) {
 		      "onrecord": my_onrecord });
 
     if (!isNaN(parseInt(mkws_config.perpage_default))) {
-	m_recPerPage = parseInt(mkws_config.perpage_default);
+	m_perpage = parseInt(mkws_config.perpage_default);
     }
 
 
@@ -259,15 +259,10 @@ function team($, teamName) {
     function my_onshow(data, teamName) {
 	debug("show");
 	m_totalRec = data.merged;
-	// move it out
-	var pager = document.getElementById("mkwsPager");
-	if (pager) {
-	    pager.innerHTML = "";
-	    pager.innerHTML +='<div style="float: right">' + M('Displaying') + ': '
-		+ (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
-		' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
-		+ data.total + ')</div>';
-	    drawPager(pager);
+
+	var pager = $(".mkwsPager.mkwsTeam_" + m_teamName);
+	if (pager.length) {
+	    pager.html(drawPager(data))
 	}
 
 	// navi
@@ -425,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);
     }
 
 
@@ -457,8 +452,8 @@ function team($, teamName) {
 
 	m_filters = []
 	redraw_navi();
-	resetPage(); // ### the globals it resents should be indexed by windowid
-	loadSelect(); // ### should use windowid
+	resetPage();
+	loadSelect();
 	triggerSearch(query, sort, targets, windowid);
 	that.switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
@@ -470,7 +465,7 @@ function team($, teamName) {
 	if (!m_submitted) return false;
 	resetPage();
 	loadSelect();
-	m_paz.show(0, m_recPerPage, m_sort);
+	m_paz.show(0, m_perpage, m_sort);
 	return false;
     }
 
@@ -526,17 +521,21 @@ function team($, teamName) {
 	}
 	debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
-	m_paz.search(m_query, m_recPerPage, m_sort, pp2filter, undefined, params);
+	m_paz.search(m_query, m_perpage, m_sort, pp2filter, undefined, params);
     }
 
 
     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_perpage) {
+	    debug("changing m_perpage from " + m_perpage + " to " + node.val());
+	    m_perpage = node.val();
 	}
     }
 
@@ -640,11 +639,16 @@ function team($, teamName) {
     }
 
 
-    function drawPager (pagerDiv)
+    function drawPager (data)
     {
+	var s = '<div style="float: right">' + M('Displaying') + ': '
+	    + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
+	    ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
+	    + data.total + ')</div>';
+
 	//client indexes pages from 1 but pz2 from 0
 	var onsides = 6;
-	var pages = Math.ceil(m_totalRec / m_recPerPage);
+	var pages = Math.ceil(m_totalRec / m_perpage);
 
 	var firstClkbl = (m_curPage - onsides > 0)
             ? m_curPage - onsides
@@ -656,7 +660,7 @@ function team($, teamName) {
 
 	var prev = '<span id="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
 	if (m_curPage > 1)
-            prev = '<a href="#" id="mkwsPrev" onclick="mkws.pagerPrev();">'
+            prev = '<a href="#" id="mkwsPrev" onclick="mkws.pagerPrev(\'' + m_teamName + '\');">'
             +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
 
 	var middle = '';
@@ -665,13 +669,13 @@ function team($, teamName) {
             if(i == m_curPage)
 		numLabel = '<b>' + i + '</b>';
 
-            middle += '<a href="#" onclick="mkws.showPage(' + i + ')"> '
+            middle += '<a href="#" onclick="mkws.showPage(\'' + m_teamName + '\', ' + i + ')"> '
 		+ numLabel + ' </a>';
 	}
 
 	var next = '<b> | </b><span id="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
 	if (pages - m_curPage > 0)
-            next = '<b> | </b><a href="#" id="mkwsNext" onclick="mkws.pagerNext()">'
+            next = '<b> | </b><a href="#" id="mkwsNext" onclick="mkws.pagerNext(\'' + m_teamName + '\')">'
             + M('Next') + ' &#62;&#62;</a>';
 
 	var predots = '';
@@ -682,12 +686,14 @@ function team($, teamName) {
 	if (lastClkbl < pages)
             postdots = '...';
 
-	pagerDiv.innerHTML += '<div style="float: clear">'
+	s += '<div style="float: clear">'
             + prev + predots + middle + postdots + next + '</div>';
+
+	return s;
     }
 
 
-    mkws.showPage = function (pageNum)
+    that.showPage = function (pageNum)
     {
 	m_curPage = pageNum;
 	m_paz.showPage(m_curPage - 1);
@@ -695,15 +701,15 @@ function team($, teamName) {
 
 
     // simple paging functions
-    mkws.pagerNext = function () {
-	if (m_totalRec - m_recPerPage*m_curPage > 0) {
+    that.pagerNext = function () {
+	if (m_totalRec - m_perpage*m_curPage > 0) {
             m_paz.showNext();
             m_curPage++;
 	}
     }
 
 
-    mkws.pagerPrev = function () {
+    that.pagerPrev = function () {
 	if (m_paz.showPrev() != false)
             m_curPage--;
     }
@@ -929,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() + ' ';
 	    }
@@ -940,7 +947,7 @@ function team($, teamName) {
 	    }
             ranking_data += '</form>';
 
-	    $("#mkwsRanking").html(ranking_data);
+	    node.html(ranking_data);
 	}
 
 	mkws_html_switch();
@@ -1012,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];
@@ -1032,14 +1039,14 @@ function team($, teamName) {
 
 
     function mkws_html_perpage() {
-	debug("HTML perpage");
-	var perpage_html = '<select name="mkwsPerpage" id="mkwsPerpage">';
+	debug("HTML perpage, m_perpage = " + m_perpage);
+	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];
 
 	    perpage_html += '<option value="' + key + '"';
-	    if (key == mkws_config.perpage_default) {
+	    if (key == m_perpage) {
 		perpage_html += ' selected="selected"';
 	    }
 	    perpage_html += '>' + key + '</option>';
@@ -1349,6 +1356,18 @@ function _mkws_jquery_plugin ($) {
 	mkws.teams[tname].delimitQuery(field, value);
     }
 
+    mkws.showPage = function (tname, pageNum) {
+	mkws.teams[tname].showPage(pageNum);
+    }
+
+    mkws.pagerPrev = function (tname) {
+	mkws.teams[tname].pagerPrev();
+    }
+
+    mkws.pagerNext = function (tname) {
+	mkws.teams[tname].pagerNext();
+    }
+
 
     function default_mkws_config() {
 	/* default mkws config */