X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=f4e0c8858bd2618d3380ffd8d84998049075e9b1;hb=18e6ebfc3219c0991124d9a3f9968640fb7d95b4;hp=2e6db95cecb8257f2f9c892999c599633bf4ed29;hpb=5d0f34431cd23d6932f651345a1fb11d37053d6c;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index 2e6db95..f4e0c88 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,7 +386,7 @@ function team($, teamName) { }; - function loadTemplate(name) { + function loadTemplate(name, fallbackString) { var template = m_template[name]; if (template === undefined) { @@ -399,13 +400,20 @@ function team($, teamName) { source = node.html(); } + // If the template is not defined in HTML, check the following + // in order: template registered in the team by a widget; + // fallback string provided on this invocation; global default. if (!source) { source = m_templateText[name]; } if (!source) { + source = fallbackString; + } + if (!source) { source = mkws.defaultTemplate(name); } + if (!source) return null; template = Handlebars.compile(source); log("compiled template '" + name + "'"); m_template[name] = template;