X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=a886bcf85f3326f0f2b34ee0cd8f29bbe1a1aa32;hb=89522ed15b98ee3d665fef7887b1a9ab87134647;hp=2abcfcab53c28bfeb722c57825b21ee07a6fbc5e;hpb=eac2786173549080d8a0816d8b921f70c97f71c2;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 2abcfca..a886bcf 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -71,7 +71,8 @@ Handlebars.registerHelper('commaList', function(items, options) {
 //
 var mkws = {
     authenticated: false,
-    debug_level: undefined, // will be initialised from mkws_config
+    debug_level: 1, // Will be overridden from mkws_config, but
+		    // initial value allows jQuery popup to use logging.
     paz: undefined, // will be set up during initialisation
     teams: {},
     locale_lang: {
@@ -329,11 +330,13 @@ function team($, teamName) {
 	for (var i = 0; i < data.length && i < max; i++) {
 	    acc.push('<div class="term">');
             acc.push('<a href="#" ');
-	    var action;
+	    var action = '';
 	    if (!pzIndex) {
 		// Special case: target selection
 		acc.push('target_id='+data[i].id+' ');
-		action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+		if (!target_filtered(data[i].id)) {
+		    action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+		}
 	    } else {
 		action = 'mkws.limitQuery(\'' + m_teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
 	    }
@@ -345,6 +348,17 @@ function team($, teamName) {
     }
 
 
+    function target_filtered(id) {
+	for (var i = 0; i < m_filters.length; i++) {
+	    if (m_filters[i].id === id ||
+		m_filters[i].id === 'pz:id=' + id) {
+		return true;
+	    }
+	}
+	return false;
+    }
+
+
     function my_onrecord(data, args, teamName) {
 	debug("record: teamName=" + teamName + ", m_teamName=" + m_teamName);
 	// FIXME: record is async!!
@@ -849,8 +863,6 @@ function team($, teamName) {
 	if (mkws_config.show_lang)
 	    mkws_html_lang();
 
-	// For some reason, doing this programmatically results in
-	// document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
 	debug("HTML search form");
 	// ### There is only one match here by design: fix not to bother looping
 	$('.mkwsSearch.mkwsTeam_' + m_teamName).each(function (i, obj) {
@@ -858,8 +870,8 @@ function team($, teamName) {
 	    mkws.handle_node_with_team(node, function(tname) {
 		$(node).html('\
 <form name="mkwsSearchForm" class="mkwsSearchForm mkwsTeam_' + tname + '" action="" >\
-  <input id="mkwsQuery" class="mkwsQuery mkwsTeam_' + tname + '" type="text" size="' + mkws_config.query_width + '" />\
-  <input id="mkwsButton" class="mkwsButton mkwsTeam_' + tname + '" type="submit" value="' + M('Search') + '" />\
+  <input class="mkwsQuery mkwsTeam_' + tname + '" type="text" size="' + mkws_config.query_width + '" />\
+  <input class="mkwsButton mkwsTeam_' + tname + '" type="submit" value="' + M('Search') + '" />\
 </form>');
 	    });
 	});
@@ -879,13 +891,13 @@ function team($, teamName) {
 <table width="100%" border="0" cellpadding="6" cellspacing="0">\
   <tr>\
     <td class="mkwsTermlistContainer1 mkwsTeam_' + m_teamName + '" width="250" valign="top">\
-      <div id="mkwsTermlists" class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
     </td>\
     <td class="mkwsMOTDContainer mkwsTeam_' + m_teamName + '" valign="top">\
-      <div id="mkwsRanking" class="mkwsRanking mkwsTeam_' + m_teamName + '"></div>\
-      <div id="mkwsPager" class="mkwsPager mkwsTeam_' + m_teamName + '"></div>\
-      <div id="mkwsNavi" class="mkwsNavi mkwsTeam_' + m_teamName + '"></div>\
-      <div id="mkwsRecords" class="mkwsRecords mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsRanking mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsPager mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsNavi mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsRecords mkwsTeam_' + m_teamName + '"></div>\
     </td>\
   </tr>\
   <tr>\