X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=b9d899b116da69891143233bc541d9c7c2c0b310;hb=e69e9ba6777cd0186c58db2699e6419449d3c22a;hp=f956e556b94da49167a0cc06cd1aceed82ec28e0;hpb=af763f5738e21aa60891e19e732c8ade5ec217b6;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index f956e55..b9d899b 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -598,20 +598,15 @@ function team($, teamName) {
 
 
     // Finds the node of the specified class within the current team
-    // Multiple OR-clauses separated by commas are handled
-    // More complex cases may not work
-    //
     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 +636,15 @@ function team($, teamName) {
 
 	if (template === undefined) {
 	    // Fall back to generic template if there is no team-specific one
+	    var source;
 	    var node = widgetNode("Template_" + name);
-	    if (!node.length) {
+	    if (!node) {
 		node = widgetNode("Template_" + name, "ALL");
 	    }
+            if (node) {
+	        source = node.html();
+            }
 
-	    var source = node.html();
 	    if (!source) {
 		source = defaultTemplate(name);
 	    }