From 6c2be612315d7afb929dbd1d38df7fd6de625600 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Mon, 27 Jan 2014 16:14:52 +0000 Subject: [PATCH] Factor team-name extraction out into new utility function mkws.handle_node_with_team() --- tools/htdocs/mkws.js | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 70ff3c3..ecba8da 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -1299,24 +1299,14 @@ function _mkws_jquery_plugin ($) { //
$('.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 +1320,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 = { -- 1.7.10.4