Simplify findnode, which no longer needs to deal with commas.

[mkws-moved-to-github.git] / src / mkws-team.js

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 38b8507..683f11c 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -604,14 +604,12 @@ function team($, teamName) {
     function findnode(selector, teamName) {
        teamName = teamName || m_teamName;
 
-       selector = $.map(selector.split(','), function(s, i) {
-           if (teamName === 'AUTO') {
-               return (s + '.mkwsTeam_' + teamName + ',' +
-                       s + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
-           } else {
-               return s + '.mkwsTeam_' + teamName;
-           }
-       }).join(',');
+       if (teamName === 'AUTO') {
+           selector = (selector + '.mkwsTeam_' + teamName + ',' +
+                       selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
+       } else {
+           selector = selector + '.mkwsTeam_' + teamName;
+       }
 
        var node = $(selector);
        //log('findnode(' + selector + ') found ' + node.length + ' nodes');
@@ -641,12 +639,15 @@ function team($, teamName) {
 
        if (template === undefined) {
            // Fall back to generic template if there is no team-specific one
-           var node = findnode(".mkwsTemplate_" + name);
-           if (!node.length) {
-               node = findnode(".mkwsTemplate_" + name, "ALL");
+           var source;
+           var node = widgetNode("Template_" + name);
+           if (!node) {
+               node = widgetNode("Template_" + name, "ALL");
            }
+            if (node) {
+               source = node.html();
+            }
 
-           var source = node.html();
            if (!source) {
                source = defaultTemplate(name);
            }