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

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 8872eb3..b9d899b 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -332,10 +332,10 @@ function team($, teamName) {
 
     // switching view between targets and records
     function switchView(view) {
-	var targets = findnode('.mkwsTargets');
-	var results = findnode('.mkwsResults,.mkwsRecords');
-	var blanket = findnode('.mkwsBlanket');
-	var motd    = findnode('.mkwsMOTD');
+	var targets = widgetNode('Targets');
+	var results = widgetNode('Results') || widgetNode('Records');
+	var blanket = widgetNode('Blanket');
+	var motd    = widgetNode('MOTD');
 
 	switch(view) {
         case 'targets':
@@ -452,13 +452,13 @@ function team($, teamName) {
 	mkwsHtmlSwitch();
 
 	findnode('.mkwsSearchForm').submit(function() {
-	    var val = findnode('.mkwsQuery').val();
+	    var val = widgetNode('Query').val();
 	    newSearch(val);
 	    return false;
 	});
 
 	// on first page, hide the termlist
-	$(document).ready(function() { findnode(".mkwsTermlists").hide(); });
+	$(document).ready(function() { widgetNode("Termlists").hide(); });
         var container = findnode(".mkwsMOTDContainer");
 	if (container.length) {
 	    // Move the MOTD from the provided element down into the container
@@ -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');
@@ -620,6 +615,13 @@ function team($, teamName) {
     that.findnode = findnode;
 
 
+    // This much simpler and more efficient function should be usable
+    // in place of most uses of findnode.
+    function widgetNode(type) {
+        var w = that.widget(type);
+        return w ? $(w.node) : undefined;
+    }
+
     function renderDetails(data, marker) {
 	var template = loadTemplate("Record");
 	var details = template(data);
@@ -634,12 +636,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);
 	    }
@@ -744,7 +749,7 @@ function team($, teamName) {
 
     that.addWidget = function(w) {
         if (!m_widgets[w.type]) {
-            m_widgets[w.type] = widget;
+            m_widgets[w.type] = w;
             log("Registered '" + w.type + "' widget in team '" + m_teamName + "'");
         } else if (typeof(m_widgets[w.type]) !== 'number') {
             m_widgets[w.type] = 2;