Main iteration to create widgets moved to new function

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

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 53a65fc..cf4794b 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -26,7 +26,8 @@ function team($, teamName) {
        "last": $.now()
     };
     var m_paz; // will be initialised below
-    var m_template = {};
+    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
 
@@ -267,15 +268,17 @@ function team($, teamName) {
        if (query) m_query = query;
        if (sortOrder) m_sortOrder = sortOrder;
        if (perpage) m_perpage = perpage;
-       if (targets) m_filterSet.add(targetFilter(id, id));
+       if (targets) m_filterSet.add(targetFilter(targets, targets));
 
        var pp2filter = m_filterSet.pp2filter();
        var pp2limit = m_filterSet.pp2limit(limit);
         var pp2catLimit = m_filterSet.pp2catLimit();
+       if (pp2catLimit) {
+            pp2filter = pp2filter ? pp2filter + "," + pp2catLimit : pp2catLimit;
+        }
 
        var params = {};
        if (pp2limit) params.limit = pp2limit;
-       if (pp2catLimit) params.categoryfilter = pp2catLimit;
        if (maxrecs) params.maxrecs = maxrecs;
        if (torusquery) {
            if (!mkws.config.use_service_proxy)
@@ -418,7 +421,10 @@ function team($, teamName) {
        });
 
        // on first page, hide the termlist
-       $(document).ready(function() { widgetNode("Termlists").hide(); });
+       $(document).ready(function() {
+            var t = widgetNode("Termlists");
+            if (t) t.hide();
+        });
         var container = findnode(".mkwsMOTDContainer");
        if (container.length) {
            // Move the MOTD from the provided element down into the container
@@ -611,6 +617,11 @@ function team($, teamName) {
     that.renderDetails = renderDetails;
 
 
+    that.registerTemplate = function(name, text) {
+        m_tempateText[name] = text;
+    };
+
+
     function loadTemplate(name) {
        var template = m_template[name];
 
@@ -626,6 +637,9 @@ function team($, teamName) {
             }
 
            if (!source) {
+                source = m_tempateText[name];
+            }
+           if (!source) {
                source = defaultTemplate(name);
            }