Pass number of sentences through into mkws-paragraphs Handlebars helper.

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

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 8523ec7..2e6db95 100644 (file)
--- 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,14 @@ 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) {
+      queue("complete").publish(hitcount);
+    }
   }
 
   function onTerm(data) {
@@ -241,6 +248,7 @@ function team($, teamName) {
   function resetPage() {
     m_currentPage = 1;
     m_totalRecordCount = 0;
+    m_gotRecords = false;
   }
   that.resetPage = resetPage;
 
@@ -373,7 +381,7 @@ function team($, teamName) {
 
 
   that.registerTemplate = function(name, text) {
-    m_tempateText[name] = text;
+    m_templateText[name] = text;
   };
 
 
@@ -383,16 +391,16 @@ function team($, teamName) {
     if (template === undefined) {
       // Fall back to generic template if there is no team-specific one
       var source;
-      var node = widgetNode("Template_" + name);
-      if (!node) {
-        node = widgetNode("Template_" + name, "ALL");
+      var node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
+      if (node && node.length < 1) {
+        node = $(".mkwsTemplate_" + name);
       }
       if (node) {
         source = node.html();
       }
 
       if (!source) {
-        source = m_tempateText[name];
+        source = m_templateText[name];
       }
       if (!source) {
         source = mkws.defaultTemplate(name);