X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=935bcaa24c1c8d9695e5db9573a6f0eb15e84a97;hb=1e59ea3b6c29afeaf938fdb47729d2ec5f2cf7fc;hp=759a1a785b5b6c15b85824cc4dbaa4b0377a4f60;hpb=15c9f739698073ae375a4dc8822fa5b366351a33;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 759a1a7..935bcaa 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -29,7 +29,7 @@ function team($, teamName) {
     var m_tempateText = {}; // widgets can register tempates to be compiled
     var m_template = {}; // compiled templates, from any source
     var m_config = mkws.objectInheritingFrom(mkws.config);
-    var m_widgets = {}; // Maps widget-type to object
+    var m_widgets = {}; // Maps widget-type to array of widget objects
 
     that.toString = function() { return '[Team ' + teamName + ']'; };
 
@@ -314,13 +314,6 @@ function team($, teamName) {
             if (blanket) blanket.css('display', 'block');
             if (motd) motd.css('display', 'none');
             break;
-	case 'none':
-	    alert("mkws.switchView(" + m_teamName + ", 'none') shouldn't happen");
-            if (targets) targets.css('display', 'none');
-            if (results) results.css('display', 'none');
-            if (blanket) blanket.css('display', 'none');
-            if (motd) motd.css('display', 'none');
-            break;
         default:
             alert("Unknown view '" + view + "'");
 	}
@@ -348,46 +341,21 @@ function team($, teamName) {
     };
 
 
-    /*
-     * All the HTML stuff to render the search forms and
-     * result pages.
-     */
-    function mkwsHtmlAll() {
-        var container = findnode(".mkwsMOTDContainer");
-	if (container.length) {
-	    // Move the MOTD from the provided element down into the container
-	    findnode(".mkwsMOTD").appendTo(container);
-	}
-    }
-
-
-    function mkwsSetLang()  {
-	var lang = mkws.getParameterByName("lang") || m_config.lang;
-	if (!lang || !mkws.locale_lang[lang]) {
-	    m_config.lang = ""
-	} else {
-	    m_config.lang = lang;
-	}
-
-	log("Locale language: " + (m_config.lang ? m_config.lang : "none"));
-	return m_config.lang;
-    }
-
-
     // Translation function. At present, this is properly a
     // global-level function (hence the assignment to mkws.M) but we
     // want to make it per-team so different teams can operate in
     // different languages.
     //
-    function M(word) {
-	var lang = m_config.lang;
+    mkws.M = function (word) {
+	var lang = mkws.config.lang;
+        log("in M('" + word + "'), lang=" + lang);
 
 	if (!lang || !mkws.locale_lang[lang])
 	    return word;
 
 	return mkws.locale_lang[lang][word] || word;
-    }
-    mkws.M = M; // so the Handlebars helper can use it
+    };
+    var M = mkws.M;
 
 
     // Finds the node of the specified class within the current team
@@ -405,11 +373,8 @@ function team($, teamName) {
 	//log('findnode(' + selector + ') found ' + node.length + ' nodes');
 	return node;
     }
-    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;
@@ -461,30 +426,48 @@ function team($, teamName) {
 
 
     that.addWidget = function(w) {
-        if (!m_widgets[w.type]) {
-            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;
-            log("Registered duplicate '" + w.type + "' widget in team '" + m_teamName + "'");
+        if (m_widgets[w.type] === undefined) {
+            m_widgets[w.type] = [ w ];
+            log("Added '" + w.type + "' widget to team '" + m_teamName + "'");
         } else {
-            m_widgets[w.type] += 1;
-            log("Registered '" + w.type + "' widget #" + m_widgets[w.type] + "' in team '" + m_teamName + "'");
+            m_widgets[w.type].push(w);
+            log("Added '" + w.type + "' widget #" + m_widgets[w.type].length + "' to team '" + m_teamName + "'");
         }
     }
 
-    that.widgetTypes = function() {
-        var keys = [];
-        for (var k in m_widgets) keys.push(k);
-        return keys.sort();
+    that.visitWidgets = function(callback) {
+        for (var type in m_widgets) {
+            var list = m_widgets[type];
+            for (var i = 0; i < list.length; i++) {
+                var res = callback(type, list[i]);
+                if (res !== undefined) {
+                    return res;
+                }
+            }
+        }
+        return undefined;
     }
 
     that.widget = function(type) {
-        return m_widgets[type];
+        var list = m_widgets[type];
+
+        if (!list)
+            return undefined;
+        if (list.length > 1) {
+            alert("widget('" + type + "') finds " + list.length + " widgets: using first");
+        }
+        return list[0];
+    }
+
+
+    var lang = mkws.getParameterByName("lang") || mkws.config.lang;
+    if (!lang || !mkws.locale_lang[lang]) {
+	mkws.config.lang = ""
+    } else {
+	mkws.config.lang = lang;
     }
 
-    mkwsHtmlAll()
-    mkwsSetLang();
+    log("Locale language: " + (mkws.config.lang ? mkws.config.lang : "none"));
 
     return that;
 };