X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=872f957ec6df80ff4739c5753cb7a5c1968c7204;hb=acc4c917f360440927547e958ebd32b1d2aca711;hp=4f4c68b6cf77b9a4d3c82582e2c8131eddaf7570;hpb=db92998b2ed05541bfdae69037714fe489250ddf;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index 4f4c68b..872f957 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -1,10 +1,12 @@ // Factory function for team objects. As much as possible, this uses // only member variables (prefixed "m_") and inner functions with -// private scope. Some functions are visible as member-functions to be -// called from outside code -- specifically, from generated -// HTML. These functions are that.switchView(), showDetails(), -// limitTarget(), limitQuery(), delimitTarget(), delimitQuery(), -// showPage(), pagerPrev(), pagerNext(). +// private scope. +// +// Some functions are visible as member-functions to be called from +// outside code -- specifically, from generated HTML. These functions +// are that.switchView(), showDetails(), limitTarget(), limitQuery(), +// delimitTarget(), delimitQuery(), showPage(), pagerPrev(), +// pagerNext(). // function team($, teamName) { var that = {}; @@ -26,6 +28,9 @@ function team($, teamName) { var m_paz; // will be initialised below var m_template = {}; + that.toString = function() { return '[Team ' + teamName + ']'; } + + // Accessor methods for individual widgets: readers that.name = function() { return m_teamName; } that.submitted = function() { return m_submitted; } that.perpage = function() { return m_perpage; } @@ -35,11 +40,12 @@ function team($, teamName) { that.currentRecordData = function() { return m_currentRecordData; } that.filters = function() { return m_filters; } + // Accessor methods for individual widgets: writers that.set_sortOrder = function(val) { m_sortOrder = val }; that.set_perpage = function(val) { m_perpage = val }; - var log = function (s) { + function log(s) { var now = $.now(); var timestamp = ((now - m_logTime.start)/1000).toFixed(3) + " (+" + ((now - m_logTime.last)/1000).toFixed(3) + ") " m_logTime.last = now; @@ -71,34 +77,28 @@ function team($, teamName) { }); - // // pz2.js event handlers: - // function onInit() { log("init"); m_paz.stat(); m_paz.bytarget(); } - function onBytarget(data) { log("target"); queue("targets").publish(data); } - function onStat(data) { log("stat"); queue("stat").publish(data); } - function onTerm(data) { log("term"); queue("termlists").publish(data); } - function onShow(data, teamName) { log("show"); m_totalRecordCount = data.merged; @@ -106,14 +106,12 @@ function team($, teamName) { queue("records").publish(data); } - function onRecord(data, args, teamName) { log("record"); // FIXME: record is async!! clearTimeout(m_paz.recordTimer); - // ##### restrict to current team - var detRecordDiv = document.getElementById(recordDetailsId(data.recid[0])); - if (detRecordDiv) { + var detRecordDiv = findnode(recordDetailsId(data.recid[0])); + if (detRecordDiv.length) { // in case on_show was faster to redraw element return; } @@ -124,7 +122,7 @@ function team($, teamName) { } - // Used by promoteRecords() and onRecord() + // Used by the Records widget and onRecord() function recordElementId(s) { return 'mkwsRec_' + s.replace(/[^a-z0-9]/ig, '_'); } @@ -134,7 +132,6 @@ function team($, teamName) { function recordDetailsId(s) { return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_'); } - that.recordElementId = recordElementId; that.targetFiltered = function(id) { @@ -148,36 +145,6 @@ function team($, teamName) { } - //////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////// - - - // when search button pressed - function onFormSubmitEventHandler() - { - var val = findnode('.mkwsQuery').val(); - newSearch(val); - return false; - } - - - function newSearch(query, sortOrder, targets) - { - log("newSearch: " + query); - - if (mkws_config.use_service_proxy && !mkws.authenticated) { - alert("searching before authentication"); - return; - } - - m_filters = [] - triggerSearch(query, sortOrder, targets); - switchView('records'); // In case it's configured to start off as hidden - m_submitted = true; - } - - - // limit by target functions that.limitTarget = function (id, name) { log("limitTarget(id=" + id + ", name=" + name + ")"); @@ -187,7 +154,6 @@ function team($, teamName) { } - // limit the query after clicking the facet that.limitQuery = function (field, value) { log("limitQuery(field=" + field + ", value=" + value + ")"); @@ -239,6 +205,32 @@ function team($, teamName) { } + that.showPage = function (pageNum) + { + m_currentPage = pageNum; + m_paz.showPage(m_currentPage - 1); + } + + + that.pagerNext = function () { + if (m_totalRecordCount - m_perpage*m_currentPage > 0) { + m_paz.showNext(); + m_currentPage++; + } + } + + + that.pagerPrev = function () { + if (m_paz.showPrev() != false) + m_currentPage--; + } + + + that.reShow = function() { + m_paz.show(0, m_perpage, m_sortOrder); + } + + function resetPage() { m_currentPage = 1; @@ -247,6 +239,22 @@ function team($, teamName) { that.resetPage = resetPage; + function newSearch(query, sortOrder, targets) + { + log("newSearch: " + query); + + if (mkws_config.use_service_proxy && !mkws.authenticated) { + alert("searching before authentication"); + return; + } + + m_filters = [] + triggerSearch(query, sortOrder, targets); + switchView('records'); // In case it's configured to start off as hidden + m_submitted = true; + } + + function triggerSearch (query, sortOrder, targets) { resetPage(); @@ -297,34 +305,6 @@ function team($, teamName) { } - that.reShow = function() { - m_paz.show(0, m_perpage, m_sortOrder); - } - - - - that.showPage = function (pageNum) - { - m_currentPage = pageNum; - m_paz.showPage(m_currentPage - 1); - } - - - // simple paging functions - that.pagerNext = function () { - if (m_totalRecordCount - m_perpage*m_currentPage > 0) { - m_paz.showNext(); - m_currentPage++; - } - } - - - that.pagerPrev = function () { - if (m_paz.showPrev() != false) - m_currentPage--; - } - - // switching view between targets and records function switchView(view) { var targets = findnode('.mkwsTargets'); @@ -441,7 +421,11 @@ function team($, teamName) { mkwsHtmlSwitch(); - findnode('.mkwsSearchForm').submit(onFormSubmitEventHandler); + findnode('.mkwsSearchForm').submit(function() { + var val = findnode('.mkwsQuery').val(); + newSearch(val); + return false; + }); // on first page, hide the termlist $(document).ready(function() { findnode(".mkwsTermlists").hide(); }); @@ -640,7 +624,9 @@ function team($, teamName) { return s + '.mkwsTeam_' + teamName; }).join(','); - return $(selector); + var node = $(selector); + //log('findnode(' + selector + ') found ' + node.length + ' nodes'); + return node; } @@ -781,20 +767,7 @@ function team($, teamName) { } that.queue = queue; + mkwsHtmlAll() - // main - (function() { - try { - mkwsHtmlAll() - } - - catch (e) { - mkws_config.error = e.message; - // alert(e.message); - } - })(); - - // Bizarrely, 'that' is just an empty hash. All its state is in - // the closure variables defined earlier in this function. return that; };