X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=43f2fbfefd62517011177d704cf8fc83397d9135;hb=ce37a09dfef064ccff9d39c97fccedbc29976925;hp=a8383e0edba4301b32eb6a5fcddb41181780b582;hpb=5b22f5dbb32564454ce63cd73b33237bc2103b18;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index a8383e0..43f2fbf 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; @@ -122,7 +122,7 @@ mkws.makeTeam = function($, teamName) { function onTerm(data) { log("term"); - queue("termlists").publish(data); + queue("facets").publish(data); } function onShow(data, teamName) { @@ -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("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.facets && 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("created 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, '_'); } @@ -321,10 +340,10 @@ mkws.makeTeam = function($, teamName) { // switching view between targets and records function switchView(view) { - var targets = widgetNode('Targets'); - var results = widgetNode('Results') || widgetNode('Records'); - var blanket = widgetNode('Blanket'); - var motd = widgetNode('MOTD'); + var targets = widgetNode('targets'); + var results = widgetNode('results') || widgetNode('records'); + var blanket = widgetNode('blanket'); + var motd = widgetNode('motd'); switch(view) { case 'targets': @@ -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^="mkws-team"],[class*=" mkws-team"])'); } else { - selector = selector + '.mkwsTeam_' + teamName; + selector = selector + '.mkws-team-' + teamName; } var node = $(selector); @@ -389,26 +408,35 @@ mkws.makeTeam = function($, teamName) { } function renderDetails(data, marker) { - var template = loadTemplate("Record"); + var template = loadTemplate("details"); var details = template(data); - return '