X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=e15f9eacb3bc7a71538902b11ecc81df17ae5032;hp=0ff94ff94a132b8b683412901a22f64ad51e7164;hb=c5c7c61750ae3f164f8ee04c009b01283fbda269;hpb=05e195768393c50779514624d27fbf8942a9955e

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 0ff94ff..e15f9ea 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -158,24 +158,23 @@ function widget($, team, type, node) {
 
     var M = mkws.M;
 
-    if (type === 'Targets') {
-	promoteTargets();
-	team.debug("made targets widget(node=" + node + ")");
-    } else if (type === 'Stat') {
-	promoteStat();
-	team.debug("made stat widget(node=" + node + ")");
-    } else if (type === 'Termlists') {
-	promoteTermlists();
-	team.debug("made termlists widget(node=" + node + ")");
-    } else if (type === 'Pager') {
-	promotePager();
-	team.debug("made pager widget(node=" + node + ")");
-    } else if (type === 'Records') {
-	promoteRecords();
-	team.debug("made records widget(node=" + node + ")");
+    var type2fn = {
+	Targets: promoteTargets,
+	Stat: promoteStat,
+	Termlists: promoteTermlists,
+	Pager: promotePager,
+	Records: promoteRecords,
+	Navi: promoteNavi,
+	Sort: promoteSort,
+	Perpage: promotePerpage
+    };
+
+    var promote = type2fn[type];
+    if (promote) {
+	promote();
+	team.debug("made " + type + " widget(node=" + node + ")");
     } else {
-	// ### Handle other types here
-	team.debug("made unencapsulated widget(type=" + type + ", node=" + node + ")");
+	team.debug("made UNENCAPSULATED widget(type=" + type + ", node=" + node + ")");
     }
 
     return that;
@@ -187,8 +186,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>' +
@@ -374,6 +371,58 @@ function widget($, team, type, node) {
 	    }
 	});
     }
+
+
+    function promoteNavi() {
+	team.queue("navi").subscribe(function() {
+	    var filters = team.filters();
+	    var text = "";
+
+	    for (var i in filters) {
+		if (text) {
+		    text += " | ";
+		}
+		var filter = filters[i];
+		if (filter.id) {
+		    text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + team.name() +
+			"', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
+		} else {
+		    text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + team.name() +
+			"', '" + filter.field + "', '" + filter.value + "'" +
+			');return false;">' + filter.value + '</a>';
+		}
+	    }
+
+	    $(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(function () {
+	    team.set_sortOrder($(node).val());
+	    if (team.submitted()) {
+		team.resetPage();
+		team.reShow();
+	    }
+	    return false;
+	});
+    }
+
+
+    function promotePerpage() {
+	$(node).change(function() {
+	    team.set_perpage($(node).val());
+	    if (team.submitted()) {
+		team.resetPage();
+		team.reShow();
+	    }
+	    return false;
+	});
+    }
 }
 
 
@@ -406,11 +455,17 @@ 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; }
     that.currentRecordId = function() { return m_currentRecordId; }
     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();
@@ -529,74 +584,87 @@ 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()
+    // limit by target functions
+    that.limitTarget  = function (id, name)
     {
-	if (!m_submitted) return false;
-	resetPage();
-	loadSelect();
-	m_paz.show(0, m_perpage, m_sortOrder);
+	debug("limitTarget(id=" + id + ", name=" + name + ")");
+	m_filters.push({ id: id, name: name });
+	triggerSearch();
 	return false;
     }
 
 
-    function redrawNavi ()
+    // limit the query after clicking the facet
+    that.limitQuery = function (field, value)
     {
-	var navi = findnode('.mkwsNavi');
-	if (!navi) return;
+	debug("limitQuery(field=" + field + ", value=" + value + ")");
+	m_filters.push({ field: field, value: value });
+	triggerSearch();
+	return false;
+    }
+
 
-	var text = "";
+    that.delimitTarget = function (id)
+    {
+	debug("delimitTarget(id=" + id + ")");
+	var newFilters = [];
 	for (var i in m_filters) {
-	    if (text) {
-		text += " | ";
-	    }
 	    var filter = m_filters[i];
 	    if (filter.id) {
-		text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + m_teamName +
-		    "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
+		debug("delimitTarget() removing filter " + $.toJSON(filter));
 	    } else {
-		text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + m_teamName +
-		    "', '" + filter.field + "', '" + filter.value + "'" +
-		    ');return false;">' + filter.value + '</a>';
+		debug("delimitTarget() keeping filter " + $.toJSON(filter));
+		newFilters.push(filter);
 	    }
 	}
+	m_filters = newFilters;
 
-	navi.html(text);
+	triggerSearch();
+	return false;
     }
 
 
-    function resetPage()
+    that.delimitQuery = function (field, value)
     {
-	m_currentPage = 1;
-	m_totalRecordCount = 0;
+	debug("delimitQuery(field=" + field + ", value=" + value + ")");
+	var newFilters = [];
+	for (var i in m_filters) {
+	    var filter = m_filters[i];
+	    if (filter.field &&
+		field == filter.field &&
+		value == filter.value) {
+		debug("delimitQuery() removing filter " + $.toJSON(filter));
+	    } else {
+		debug("delimitQuery() keeping filter " + $.toJSON(filter));
+		newFilters.push(filter);
+	    }
+	}
+	m_filters = newFilters;
+
+	triggerSearch();
+	return false;
     }
 
 
-    function loadSelect ()
+    function resetPage()
     {
-	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();
-	}
+	m_currentPage = 1;
+	m_totalRecordCount = 0;
     }
+    that.resetPage = resetPage;
 
 
     function triggerSearch (query, sortOrder, targets)
     {
+	resetPage();
+	queue("navi").publish();
+
 	var pp2filter = "";
 	var pp2limit = "";
 
@@ -642,79 +710,11 @@ function team($, teamName) {
     }
 
 
-    // limit by target functions
-    that.limitTarget  = function (id, name)
-    {
-	debug("limitTarget(id=" + id + ", name=" + name + ")");
-	m_filters.push({ id: id, name: name });
-	redrawNavi();
-	resetPage();
-	loadSelect();
-	triggerSearch();
-	return false;
-    }
-
-
-    // limit the query after clicking the facet
-    that.limitQuery = function (field, value)
-    {
-	debug("limitQuery(field=" + field + ", value=" + value + ")");
-	m_filters.push({ field: field, value: value });
-	redrawNavi();
-	resetPage();
-	loadSelect();
-	triggerSearch();
-	return false;
-    }
-
-
-    that.delimitTarget = function (id)
-    {
-	debug("delimitTarget(id=" + id + ")");
-	var newFilters = [];
-	for (var i in m_filters) {
-	    var filter = m_filters[i];
-	    if (filter.id) {
-		debug("delimitTarget() removing filter " + $.toJSON(filter));
-	    } else {
-		debug("delimitTarget() keeping filter " + $.toJSON(filter));
-		newFilters.push(filter);
-	    }
-	}
-	m_filters = newFilters;
-
-	redrawNavi();
-	resetPage();
-	loadSelect();
-	triggerSearch();
-	return false;
+    that.reShow = function() {
+	m_paz.show(0, m_perpage, m_sortOrder);
     }
 
 
-    that.delimitQuery = function (field, value)
-    {
-	debug("delimitQuery(field=" + field + ", value=" + value + ")");
-	var newFilters = [];
-	for (var i in m_filters) {
-	    var filter = m_filters[i];
-	    if (filter.field &&
-		field == filter.field &&
-		value == filter.value) {
-		debug("delimitQuery() removing filter " + $.toJSON(filter));
-	    } else {
-		debug("delimitQuery() keeping filter " + $.toJSON(filter));
-		newFilters.push(filter);
-	    }
-	}
-	m_filters = newFilters;
-
-	redrawNavi();
-	resetPage();
-	loadSelect();
-	triggerSearch();
-	return false;
-    }
-
 
     that.showPage = function (pageNum)
     {
@@ -769,8 +769,6 @@ function team($, teamName) {
             alert("Unknown view '" + view + "'");
 	}
     }
-
-
     that.switchView = switchView;
 
 
@@ -826,8 +824,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">\
@@ -846,43 +843,27 @@ function team($, teamName) {
     </td>\
   </tr>\
 </table>');
-	}
 
-	var node = findnode(".mkwsRanking");
-	if (node.length) {
-	    var ranking_data = '';
-	    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(onSelectDdChange);
-	node = findnode('.mkwsPerpage');
-	if (node.length)
-	    node.change(onSelectDdChange);
+	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);
 	}
     }
 
@@ -1122,7 +1103,6 @@ function team($, teamName) {
 	}
 	return queues[id];
     }
-
     that.queue = queue;
 
 
@@ -1512,7 +1492,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];