X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=b5dc51d1b35efc3befb7da2ea8759630f0cbb414;hb=e1910c1453642bea8ffad32e3e1a4e52f1ecf8eb;hp=70ff3c3e311de12ea017742ccb395da047d4d51b;hpb=b4cfacd8ea9c90b4862c30892a2ebcda5184eb07;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 70ff3c3..b5dc51d 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -404,7 +404,14 @@ function _make_mkws_team($, teamName) {
     // wait until the DOM is ready
     function domReady ()
     {
-	document.mkwsSearchForm.onsubmit = onFormSubmitEventHandler;
+	$('.mkwsSearchForm').each(function (i, obj) {
+	    var node = this;
+	    debug("adding class 'foo' to node " + node);
+	    mkws.handle_node_with_team(node, function(tname) {
+		$(node).submit(onFormSubmitEventHandler);
+	    });
+	});
+
 	document.mkwsSearchForm.mkwsQuery.value = '';
 	if (document.mkwsSelect) {
 	    if (document.mkwsSelect.mkwsSort)
@@ -863,11 +870,16 @@ function _make_mkws_team($, teamName) {
 	// For some reason, doing this programmatically results in
 	// document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
 	debug("HTML search form");
-	$("#mkwsSearch").html('\
-<form name="mkwsSearchForm" action="" >\
-  <input id="mkwsQuery" class="mkwsQuery mkwsTeam_AUTO" type="text" size="' + mkws_config.query_width + '" />\
-  <input id="mkwsButton" class="mkwsButton mkwsTeam_AUTO" type="submit" value="' + M('Search') + '" />\
+	$('.mkwsSearch').each(function (i, obj) {
+	    var node = this;
+	    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') + '" />\
 </form>');
+	    });
+	});
 
 	debug("HTML records");
 	// If the application has an #mkwsResults, populate it in the
@@ -1297,26 +1309,16 @@ function _mkws_jquery_plugin ($) {
 	// Find all nodes with class (NOT id) mkwsRecords, and
 	// determine their team from the mkwsTeam_* class. So:
 	//	<div class="mkwsRecords mkwsTeam_foo"/>
-	$('.mkwsResults, .mkwsRecords, .mkwsTermlists').each(function () {
+	$('.mkwsSearch, .mkwsResults, .mkwsRecords, .mkwsTermlists').each(function () {
 	    var node = this;
-	    var classes = this.className;
- 	    var list = classes.split(/\s+/)
-	    var tname;
-	    for (var i = 0; i < list.length; i++) {
-		var cname = list[i];
-		if (cname.match(/^mkwsTeam_/)) {
-		    tname = cname.replace(/^mkwsTeam_/, '');
+	    mkws.handle_node_with_team(node, function(tname) {
+		if (mkws.teams[tname]) {
+		    log("MKWS team '" + tname + "' already exists, skipping");
+		} else {
+		    mkws.teams[tname] = _make_mkws_team(j, tname);
+		    log("Made MKWS team '" + tname + "'");
 		}
-	    }
-	    if (!tname)
-		tname = "AUTO";
-
-	    if (mkws.teams[tname]) {
-		log("MKWS team '" + tname + "' already exists, skipping");
-	    } else {
-		mkws.teams[tname] = _make_mkws_team(j, tname);
-		log("Made MKWS team '" + tname + "'");
-	    }
+	    });
 	});
 
 	if (mkws_config.use_service_proxy) {
@@ -1330,6 +1332,22 @@ function _mkws_jquery_plugin ($) {
     });
 
 
+    mkws.handle_node_with_team = function(node, callback) {
+	var classes = node.className;
+ 	var list = classes.split(/\s+/)
+	var tname;
+	for (var i = 0; i < list.length; i++) {
+	    var cname = list[i];
+	    if (cname.match(/^mkwsTeam_/)) {
+		tname = cname.replace(/^mkwsTeam_/, '');
+	    }
+	}
+	if (!tname)
+	    tname = "AUTO";
+	callback(tname);
+    }
+
+
     function default_mkws_config() {
 	/* default mkws config */
 	var config_default = {