X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=c9c0419b23db61f31cd7b4e718abe7769eaf6e41;hb=891162c526852295263ace8b5f9c0e70314c0d39;hp=6ef2d5c750cd49a178819723e617b2bbb22a9665;hpb=4d1210e6bc5010cd7f33b29b74bc972a43791c92;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 6ef2d5c..c9c0419 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -262,12 +262,7 @@ function team($, teamName) {
 	// 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);
+	    drawPager(pager, data);
 	}
 
 	// navi
@@ -426,7 +421,6 @@ function team($, teamName) {
 	});
 
 	if (document.mkwsSelect) {
-	    debug("messing with mkwsSelect");
 	    if (document.mkwsSelect.mkwsSort)
 		document.mkwsSelect.mkwsSort.onchange = onSelectDdChange;
 	    if (document.mkwsSelect.mkwsPerpage)
@@ -641,8 +635,13 @@ function team($, teamName) {
     }
 
 
-    function drawPager (pagerDiv)
+    function drawPager (pagerDiv, data)
     {
+	pagerDiv.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>';
+
 	//client indexes pages from 1 but pz2 from 0
 	var onsides = 6;
 	var pages = Math.ceil(m_totalRec / m_recPerPage);
@@ -954,15 +953,12 @@ function team($, teamName) {
 	    $(document).ready(function() { mkws.resize_page() });
 	}
 
-	debug("before domReady()");
 	domReady();
-	debug("after domReady()");
 
 	// on first page, hide the termlist
 	$(document).ready(function() { $(".mkwsTermlists.mkwsTeam_" + m_teamName).hide(); });
 	var motd = $(".mkwsMOTD.mkwsTeam_" + m_teamName);
 	var container = $(".mkwsMOTDContainer.mkwsTeam_" + m_teamName);
-	debug("for team '" + m_teamName + "', motd=" + motd + "(" + motd.length + "), container=" + container + "(" + container.length + ")");
 	if (motd.length && container.length) {
 	    // Move the MOTD from the provided element down into the container
 	    motd.appendTo(container);
@@ -1492,9 +1488,7 @@ function _mkws_jquery_plugin ($) {
 	$('[class^="mkws"],[class*=" mkws"]').each(function () {
 	    var node = this;
 	    mkws.handle_node_with_team(node, function(tname) {
-		if (mkws.teams[tname]) {
-		    log("MKWS team '" + tname + "' already exists, skipping");
-		} else {
+		if (!mkws.teams[tname]) {
 		    mkws.teams[tname] = team(j, tname);
 		    log("Made MKWS team '" + tname + "'");
 		}