X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=0825553bb57af58563fa08bbaed111d969756689;hb=f944d2112f977ffe31545ceaee8a1ebeb1e128d8;hp=a8383e0edba4301b32eb6a5fcddb41181780b582;hpb=5b22f5dbb32564454ce63cd73b33237bc2103b18;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index a8383e0..0825553 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -64,17 +64,17 @@ mkws.makeTeam = function($, teamName) {
   //    team.queue("eventName").subscribe(function(param1, param2 ...) { ... });
   //    team.queue("eventName").publish(arg1, arg2, ...);
   //
-  var queues = {};
+  var m_queues = {};
   function queue(id) {
-    if (!queues[id]) {
+    if (!m_queues[id]) {
       var callbacks = $.Callbacks();
-      queues[id] = {
+      m_queues[id] = {
         publish: callbacks.fire,
         subscribe: callbacks.add,
         unsubscribe: callbacks.remove
       };
     }
-    return queues[id];
+    return m_queues[id];
   };
   that.queue = queue;
 
@@ -154,31 +154,50 @@ mkws.makeTeam = function($, teamName) {
   // then register the form submit event with the pz2.search function
   // autoInit is set to true on default
   that.makePz2 = function() {
-    m_paz = new pz2({ "windowid": teamName,
-                      "pazpar2path": mkws.pazpar2_url(),
-                      "usesessions" : config.use_service_proxy ? false : true,
-                      "oninit": onInit,
-                      "onbytarget": onBytarget,
-                      "onstat": onStat,
-                      "onterm": (config.facets.length ? onTerm : undefined),
-                      "onshow": onShow,
-                      "onrecord": onRecord,
-                      "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
-                      "termlist": config.facets.join(',')
-                    });
-    log("created main pz2 object");
+    log("m_queues=" + $.toJSON(m_queues));
+    var params = {
+      "windowid": teamName,
+      "pazpar2path": mkws.pazpar2_url(),
+      "usesessions" : config.use_service_proxy ? false : true,
+      "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
+      "termlist": config.facets.join(',')
+    };
+
+    params.oninit = onInit;
+    if (m_queues.targets) {
+      params.onbytarget = onBytarget;
+      log("setting bytarget callback");
+    }
+    if (m_queues.stat) {
+      params.onstat = onStat;
+      log("setting stat callback");
+    }
+    if (m_queues.termlists && config.facets.length) {
+      params.onterm = onTerm;
+      log("setting term callback");
+    }
+    if (m_queues.records) {
+      log("setting show callback");
+      params.onshow = onShow;
+      // Record callback is subscribed from records callback
+      log("setting record callback");
+      params.onrecord = onRecord;
+    }
+
+    m_paz = new pz2(params);
+    log("ccreated main pz2 object");
   }
 
 
   // Used by the Records widget and onRecord()
   function recordElementId(s) {
-    return 'mkwsRec_' + s.replace(/[^a-z0-9]/ig, '_');
+    return 'mkws-rec_' + s.replace(/[^a-z0-9]/ig, '_');
   }
   that.recordElementId = recordElementId;
 
   // Used by onRecord(), showDetails() and renderDetails()
   function recordDetailsId(s) {
-    return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_');
+    return 'mkws-det_' + s.replace(/[^a-z0-9]/ig, '_');
   }
 
 
@@ -371,10 +390,10 @@ mkws.makeTeam = function($, teamName) {
     teamName = teamName || m_teamName;
 
     if (teamName === 'AUTO') {
-      selector = (selector + '.mkwsTeam_' + teamName + ',' +
-                  selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
+      selector = (selector + '.mkws-team-' + teamName + ',' +
+                  selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"],[class^="mkws-team-"],[class*=" mkws-team-"])');
     } else {
-      selector = selector + '.mkwsTeam_' + teamName;
+      selector = selector + '.mkws-team-' + teamName;
     }
 
     var node = $(selector);
@@ -391,7 +410,7 @@ mkws.makeTeam = function($, teamName) {
   function renderDetails(data, marker) {
     var template = loadTemplate("Record");
     var details = template(data);
-    return '<div class="mkwsDetails mkwsTeam_' + m_teamName + '" ' +
+    return '<div class="mkws-details mkws-team-' + m_teamName + '" ' +
       'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
   }
   that.renderDetails = renderDetails;
@@ -406,9 +425,9 @@ mkws.makeTeam = function($, teamName) {
     var template = m_template[name];
     if (template === undefined && Handlebars.compile) {
       var source;
-      var node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
+      var node = $(".mkws-template_" + name + " .mkws-team-" + that.name());
       if (node && node.length < 1) {
-        node = $(".mkwsTemplate_" + name);
+        node = $(".mkws-template_" + name);
       }
       if (node) source = node.html();
       if (!source) source = m_templateText[name];