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

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 8d851a3..52f2ee5 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -26,10 +26,11 @@ function team($, teamName) {
     "last": $.now()
   };
   var m_paz; // will be initialised below
-  var m_tempateText = {}; // widgets can register tempates to be compiled
+  var m_templateText = {}; // widgets can register templates 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 array of widget objects
+  var m_gotRecords = false;
 
   that.toString = function() { return '[Team ' + teamName + ']'; };
 
@@ -119,8 +120,15 @@ function team($, teamName) {
 
   function onStat(data) {
     queue("stat").publish(data);
-    if (parseInt(data.activeclients[0], 10) === 0)
-      queue("complete").publish(parseInt(data.hits[0], 10));
+    var hitcount = parseInt(data.hits[0], 10);
+    if (!m_gotRecords && hitcount > 0) {
+      m_gotRecords = true;
+      queue("firstrecords").publish(hitcount);
+    }
+    if (parseInt(data.activeclients[0], 10) === 0) {
+      log("complete");
+      queue("complete").publish(hitcount);
+    }
   }
 
   function onTerm(data) {
@@ -241,6 +249,7 @@ function team($, teamName) {
   function resetPage() {
     m_currentPage = 1;
     m_totalRecordCount = 0;
+    m_gotRecords = false;
   }
   that.resetPage = resetPage;
 
@@ -360,7 +369,7 @@ function team($, teamName) {
 
   function widgetNode(type) {
     var w = that.widget(type);
-    return w ? w.jqnode : undefined;
+    return w ? w.node : undefined;
   }
 
   function renderDetails(data, marker) {
@@ -373,37 +382,39 @@ function team($, teamName) {
 
 
   that.registerTemplate = function(name, text) {
-    m_tempateText[name] = text;
+    m_templateText[name] = text;
   };
 
 
-  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 = widgetNode("Template_" + name);
-      if (!node) {
-        node = widgetNode("Template_" + name, "ALL");
-      }
-      if (node) {
-        source = node.html();
-      }
-
-      if (!source) {
-        source = m_tempateText[name];
+      var node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
+      if (node && node.length < 1) {
+        node = $(".mkwsTemplate_" + name);
       }
-      if (!source) {
-        source = mkws.defaultTemplate(name);
+      if (node) source = node.html();
+      if (!source) source = m_templateText[name];
+      if (source) {
+        template = Handlebars.compile(source);
+        log("compiled template '" + 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;