X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-team.js;h=52f2ee592af67642cd24f60cabdde67d227e00a3;hp=2e6db95cecb8257f2f9c892999c599633bf4ed29;hb=cda7d85862a85b0841478d87a086582cb02ba002;hpb=5d0f34431cd23d6932f651345a1fb11d37053d6c

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 2e6db95..52f2ee5 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -126,6 +126,7 @@ function team($, teamName) {
       queue("firstrecords").publish(hitcount);
     }
     if (parseInt(data.activeclients[0], 10) === 0) {
+      log("complete");
       queue("complete").publish(hitcount);
     }
   }
@@ -385,33 +386,35 @@ function team($, teamName) {
   };
 
 
-  function loadTemplate(name) {
+  function loadTemplate(name, fallbackString) {
     var template = m_template[name];
-
-    if (template === undefined) {
-      // Fall back to generic template if there is no team-specific one
+    if (template === undefined && Handlebars.compile) {
       var source;
       var node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
       if (node && node.length < 1) {
         node = $(".mkwsTemplate_" + name);
       }
-      if (node) {
-        source = node.html();
-      }
-
-      if (!source) {
-        source = m_templateText[name];
+      if (node) source = node.html();
+      if (!source) source = m_templateText[name];
+      if (source) {
+        template = Handlebars.compile(source);
+        log("compiled template '" + name + "'");
       }
-      if (!source) {
-        source = mkws.defaultTemplate(name);
-      }
-
-      template = Handlebars.compile(source);
-      log("compiled template '" + name + "'");
+    }
+    //if (template === undefined) template = mkws_templatesbyteam[m_teamName][name];
+    if (template === undefined && Handlebars.templates) {
+      template = Handlebars.templates[name];
+    }
+    if (template === undefined && mkws.defaultTemplates) {
+      template = mkws.defaultTemplates[name];
+    }
+    if (template) {
       m_template[name] = template;
+      return template;
     }
-
-    return template;
+    else {
+      alert("Missing MKWS template for " + name);
+    }  
   }
   that.loadTemplate = loadTemplate;