X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=193a663816351fa0638eb4f467063a2500d1d442;hb=a254da1d32e9d3c83c0e0830f988e61d01fe0793;hp=d592626d239e0ddc858f0d25970d1ce68fb3cbaa;hpb=f63e9537a822b0c3297d0051e03f3b87bc385c40;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index d592626..193a663 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -164,7 +164,9 @@ function widget($, team, type, node) {
 	Termlists: promoteTermlists,
 	Pager: promotePager,
 	Records: promoteRecords,
-	Navi: promoteNavi
+	Navi: promoteNavi,
+	Sort: promoteSort,
+	Perpage: promotePerpage
     };
 
     var promote = type2fn[type];
@@ -394,6 +396,37 @@ function widget($, team, type, node) {
 	    $(node).html(text);
 	});
     }
+
+
+    function promoteSort() {
+	// It seems this and the Perpage widget doen't need to
+	// subscribe to anything, since they produce events rather
+	// than consuming them.
+	$(node).change(onSortChange);
+
+	function onSortChange()
+	{
+	    team.set_sortOrder($(node).val());
+	    if (!team.submitted()) return false;
+	    team.resetPage();
+	    team.reShow();
+	    return false;
+	}
+    }
+
+
+    function promotePerpage() {
+	$(node).change(onPerpageChange);
+
+	function onPerpageChange()
+	{
+	    team.set_perpage($(node).val());
+	    if (!team.submitted()) return false;
+	    team.resetPage();
+	    team.reShow();
+	    return false;
+	}
+    }
 }
 
 
@@ -426,6 +459,7 @@ function team($, teamName) {
     var m_template = {};
 
     that.name = function() { return m_teamName; }
+    that.submitted = function() { return m_submitted; }
     that.perpage = function() { return m_perpage; }
     that.totalRecordCount = function() { return m_totalRecordCount; }
     that.currentPage = function() { return m_currentPage; }
@@ -433,6 +467,10 @@ function team($, teamName) {
     that.currentRecordData = function() { return m_currentRecordData; }
     that.filters = function() { return m_filters; }
 
+    that.set_sortOrder = function(val) { m_sortOrder = val };
+    that.set_perpage = function(val) { m_perpage = val };
+
+
     var debug = function (s) {
 	var now = $.now();
 	var timestamp = ((now - m_debugTime.start)/1000).toFixed(3) + " (+" + ((now - m_debugTime.last)/1000).toFixed(3) + ") "
@@ -556,26 +594,6 @@ function team($, teamName) {
     }
 
 
-    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();
-	m_paz.show(0, m_perpage, m_sortOrder);
-	return false;
-    }
-
-
     // limit by target functions
     that.limitTarget  = function (id, name)
     {
@@ -643,6 +661,7 @@ function team($, teamName) {
 	m_currentPage = 1;
 	m_totalRecordCount = 0;
     }
+    that.resetPage = resetPage;
 
 
     function triggerSearch (query, sortOrder, targets)
@@ -695,6 +714,12 @@ function team($, teamName) {
     }
 
 
+    that.reShow = function() {
+	m_paz.show(0, m_perpage, m_sortOrder);
+    }
+
+
+
     that.showPage = function (pageNum)
     {
 	m_currentPage = pageNum;
@@ -748,8 +773,6 @@ function team($, teamName) {
             alert("Unknown view '" + view + "'");
 	}
     }
-
-
     that.switchView = switchView;
 
 
@@ -805,8 +828,7 @@ function team($, teamName) {
 	//	.mkwsPager
 	//	.mkwsNavi
 	//	.mkwsRecords
-	if (findnode(".mkwsResults").length) {
-	    findnode(".mkwsResults").html('\
+	findnode(".mkwsResults").html('\
 <table width="100%" border="0" cellpadding="6" cellspacing="0">\
   <tr>\
     <td class="mkwsTermlistContainer1 mkwsTeam_' + m_teamName + '" width="250" valign="top">\
@@ -825,42 +847,27 @@ function team($, teamName) {
     </td>\
   </tr>\
 </table>');
-	}
 
-	var node = findnode(".mkwsRanking");
-	if (node.length) {
-	    var ranking_data = '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
-	    if (mkws_config.show_sort) {
-		ranking_data +=  M('Sort by') + ' ' + mkwsHtmlSort() + ' ';
-	    }
-	    if (mkws_config.show_perpage) {
-		ranking_data += M('and show') + ' ' + mkwsHtmlPerpage() + ' ' + M('per page') + '.';
-	    }
-            ranking_data += '</form>';
-
-	    node.html(ranking_data);
+	var ranking_data = '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
+	if (mkws_config.show_sort) {
+	    ranking_data +=  M('Sort by') + ' ' + mkwsHtmlSort() + ' ';
 	}
+	if (mkws_config.show_perpage) {
+	    ranking_data += M('and show') + ' ' + mkwsHtmlPerpage() + ' ' + M('per page') + '.';
+	}
+        ranking_data += '</form>';
+	findnode(".mkwsRanking").html(ranking_data);
 
 	mkwsHtmlSwitch();
 
-	var node;
-	node = findnode('.mkwsSearchForm');
-	if (node.length)
-	    node.submit(onFormSubmitEventHandler);
-	node = findnode('.mkwsSort');
-	if (node.length)
-	    node.change(onSortChange);
-	node = findnode('.mkwsPerpage');
-	if (node.length)
-	    node.change(onPerpageChange);
+	findnode('.mkwsSearchForm').submit(onFormSubmitEventHandler);
 
 	// on first page, hide the termlist
 	$(document).ready(function() { findnode(".mkwsTermlists").hide(); });
-	var motd = findnode(".mkwsMOTD");
         var container = findnode(".mkwsMOTDContainer");
-	if (motd.length && container.length) {
+	if (container.length) {
 	    // Move the MOTD from the provided element down into the container
-	    motd.appendTo(container);
+	    findnode(".mkwsMOTD").appendTo(container);
 	}
     }
 
@@ -1100,7 +1107,6 @@ function team($, teamName) {
 	}
 	return queues[id];
     }
-
     that.queue = queue;