X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=b2bf9744ac1f0ce9f8ceffc1e5f51a18f3a99836;hb=a5db5420d793ca8550f326036e6fa30c95189719;hp=f4e0c8858bd2618d3380ffd8d84998049075e9b1;hpb=d552142db760c1a3bd7b17453d4e8065af569a74;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index f4e0c88..b2bf974 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -28,9 +28,11 @@ function team($, teamName) {
   var m_paz; // will be initialised below
   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;
+  
+  var config = mkws.objectInheritingFrom(mkws.config);
+  that.config = config;
 
   that.toString = function() { return '[Team ' + teamName + ']'; };
 
@@ -44,7 +46,6 @@ function team($, teamName) {
   that.currentRecordId = function() { return m_currentRecordId; };
   that.currentRecordData = function() { return m_currentRecordData; };
   that.filters = function() { return m_filterSet; };
-  that.config = function() { return m_config; };
 
   // Accessor methods for individual widgets: writers
   that.set_sortOrder = function(val) { m_sortOrder = val };
@@ -86,23 +87,23 @@ function team($, teamName) {
 
   log("making new widget team");
 
-  m_sortOrder = m_config.sort_default;
-  m_perpage = m_config.perpage_default;
+  m_sortOrder = config.sort_default;
+  m_perpage = config.perpage_default;
 
   // create a parameters array and pass it to the pz2's constructor
   // then register the form submit event with the pz2.search function
   // autoInit is set to true on default
   m_paz = new pz2({ "windowid": teamName,
-                    "pazpar2path": m_config.pazpar2_url,
-                    "usesessions" : m_config.use_service_proxy ? false : true,
+                    "pazpar2path": config.pazpar2_url,
+                    "usesessions" : config.use_service_proxy ? false : true,
                     "oninit": onInit,
                     "onbytarget": onBytarget,
                     "onstat": onStat,
-                    "onterm": (m_config.facets.length ? onTerm : undefined),
+                    "onterm": (config.facets.length ? onTerm : undefined),
                     "onshow": onShow,
                     "onrecord": onRecord,
                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
-                    "termlist": m_config.facets.join(',')
+                    "termlist": config.facets.join(',')
                   });
   log("created main pz2 object");
 
@@ -257,7 +258,7 @@ function team($, teamName) {
   function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
     log("newSearch: " + query);
 
-    if (m_config.use_service_proxy && !mkws.authenticated) {
+    if (config.use_service_proxy && !mkws.authenticated) {
       alert("searching before authentication");
       return;
     }
@@ -388,38 +389,34 @@ function team($, teamName) {
 
   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 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 (node) source = node.html();
+      if (!source) source = m_templateText[name];
+      if (source) {
+        template = Handlebars.compile(source);
+        log("compiled template '" + name + "'");
       }
-
-      if (!source) return null;
-      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 {
+      mkws.log("No MKWS template for " + name);
+      return null;
+    }  
   }
   that.loadTemplate = loadTemplate;