X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=b694bdea25947b53bb809cda92a5e2eda6f04df2;hb=62dfac04f5b76c782dc631c5b2b7e307e72ed8bb;hp=2d9b452780e646dd9addabc6fa15b058e939b00a;hpb=588ec81e46383127b62dc1e9d0b454dfe2637967;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 2d9b452..b694bde 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -67,7 +67,7 @@ Handlebars.registerHelper('commaList', function(items, options) { // Some functions are visible to be called from outside code, namely -// generated HTML: mkws.switchView(), showDetails(), limitTarget(), +// generated HTML: that.switchView(), showDetails(), limitTarget(), // limitQuery(), delimitTarget(), delimitQuery(), pagerPrev(), // pagerNext(), showPage(). Also mkws.M() is made available for the // Handlebars helper 'translate' @@ -194,7 +194,7 @@ function team($, teamName) { } else if (mkws.debug_level >= 2) { console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<'); } - console.log(timestamp + string); + console.log(m_teamName + ": " + timestamp + string); } var debug = mkws.debug_function; // local alias debug("start running MKWS"); @@ -250,14 +250,14 @@ function team($, teamName) { // pz2.js event handlers: // function my_oninit(teamName) { - debug("init for " + teamName); + debug("init"); m_paz.stat(); m_paz.bytarget(); } function my_onshow(data, teamName) { - debug("show for " + teamName); + debug("show"); m_totalRec = data.merged; // move it out var pager = document.getElementById("mkwsPager"); @@ -292,13 +292,13 @@ function team($, teamName) { { var template = loadTemplate("Summary"); hit._id = "mkwsRec_" + hit.recid; - hit._onclick = "mkws.showDetails(this.id, '" + m_teamName + "');return false;" + hit._onclick = "mkws.showDetails('" + m_teamName + "', this.id);return false;" return template(hit); } function my_onstat(data, teamName) { - debug("stat for " + teamName); + debug("stat"); var stat = $('.mkwsStat.mkwsTeam_' + teamName); if (stat.length === 0) return; @@ -312,7 +312,7 @@ function team($, teamName) { function my_onterm(data, teamName) { - debug("term for " + teamName); + debug("term"); var node = $(".mkwsTermlists.mkwsTeam_" + teamName); if (node.length == 0) return; @@ -347,7 +347,7 @@ function team($, teamName) { function add_single_facet(acc, caption, data, max, pzIndex) { - acc.push('
'); + acc.push('
'); acc.push('
' + M(caption) + '
'); for (var i = 0; i < data.length && i < max; i++) { acc.push('
'); @@ -356,9 +356,9 @@ function team($, teamName) { if (!pzIndex) { // Special case: target selection acc.push('target_id='+data[i].id+' '); - action = 'mkws.limitTarget(this.getAttribute(\'target_id\'),this.firstChild.nodeValue)'; + action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)'; } else { - action = 'mkws.limitQuery(\'' + pzIndex + '\', this.firstChild.nodeValue)'; + action = 'mkws.limitQuery(\'' + m_teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)'; } acc.push('onclick="' + action + ';return false;">' + data[i].name + '' + ' ' + data[i].freq + ''); @@ -369,7 +369,7 @@ function team($, teamName) { function my_onrecord(data, args, teamName) { - debug("record for " + teamName); + debug("record"); // FIXME: record is async!! clearTimeout(m_paz.recordTimer); // in case on_show was faster to redraw element @@ -383,7 +383,7 @@ function team($, teamName) { function my_onbytarget(data, teamName) { - debug("target for " + teamName); + debug("target"); var targetDiv = $('.mkwsBytarget.mkwsTeam_' + teamName); if (!targetDiv) { return; @@ -457,7 +457,7 @@ function team($, teamName) { } m_filters = [] - redraw_navi(); // ### should use windowid + redraw_navi(); resetPage(); // ### the globals it resents should be indexed by windowid loadSelect(); // ### should use windowid triggerSearch(query, sort, targets, windowid); @@ -542,11 +542,11 @@ function team($, teamName) { } - // limit the query after clicking the facet - mkws.limitQuery = function (field, value) + // limit by target functions + that.limitTarget = function (id, name) { - debug("limitQuery(field=" + field + ", value=" + value + ")"); - m_filters.push({ field: field, value: value }); + debug("limitTarget(id=" + id + ", name=" + name + ")"); + m_filters.push({ id: id, name: name }); redraw_navi(); resetPage(); loadSelect(); @@ -555,11 +555,11 @@ function team($, teamName) { } - // limit by target functions - mkws.limitTarget = function (id, name) + // limit the query after clicking the facet + that.limitQuery = function (field, value) { - debug("limitTarget(id=" + id + ", name=" + name + ")"); - m_filters.push({ id: id, name: name }); + debug("limitQuery(field=" + field + ", value=" + value + ")"); + m_filters.push({ field: field, value: value }); redraw_navi(); resetPage(); loadSelect(); @@ -568,15 +568,13 @@ function team($, teamName) { } - mkws.delimitQuery = function (field, value) + that.delimitTarget = function (id) { - debug("delimitQuery(field=" + field + ", value=" + value + ")"); + debug("delimitTarget(id=" + id + ")"); var newFilters = []; for (var i in m_filters) { var filter = m_filters[i]; - if (filter.field && - field == filter.field && - value == filter.value) { + if (filter.id) { debug("delimitTarget() removing filter " + $.toJSON(filter)); } else { debug("delimitTarget() keeping filter " + $.toJSON(filter)); @@ -593,16 +591,18 @@ function team($, teamName) { } - mkws.delimitTarget = function (id) + that.delimitQuery = function (field, value) { - debug("delimitTarget(id=" + id + ")"); + debug("delimitQuery(field=" + field + ", value=" + value + ")"); var newFilters = []; for (var i in m_filters) { var filter = m_filters[i]; - if (filter.id) { - debug("delimitTarget() removing filter " + $.toJSON(filter)); + if (filter.field && + field == filter.field && + value == filter.value) { + debug("delimitQuery() removing filter " + $.toJSON(filter)); } else { - debug("delimitTarget() keeping filter " + $.toJSON(filter)); + debug("delimitQuery() keeping filter " + $.toJSON(filter)); newFilters.push(filter); } } @@ -618,7 +618,7 @@ function team($, teamName) { function redraw_navi () { - var navi = document.getElementById('mkwsNavi'); + var navi = $('.mkwsNavi.mkwsTeam_' + m_teamName); if (!navi) return; var text = ""; @@ -628,16 +628,16 @@ function team($, teamName) { } var filter = m_filters[i]; if (filter.id) { - text += M('source') + ': ' + filter.name + ''; + text += M('source') + ': ' + filter.name + ''; } else { - text += M(filter.field) + ': ' + filter.value + ''; } } - navi.innerHTML = text; + navi.html(text); } @@ -1381,10 +1381,26 @@ function _mkws_jquery_plugin ($) { }; - mkws.showDetails = function (prefixRecId, tname) { + mkws.showDetails = function (tname, prefixRecId) { mkws.teams[tname].showDetails(prefixRecId); } + mkws.limitTarget = function (tname, id, name) { + mkws.teams[tname].limitTarget(id, name); + } + + mkws.limitQuery = function (tname, field, value) { + mkws.teams[tname].limitQuery(field, value); + } + + mkws.delimitTarget = function (tname, id) { + mkws.teams[tname].delimitTarget(id); + } + + mkws.delimitQuery = function (tname, field, value) { + mkws.teams[tname].delimitQuery(field, value); + } + function default_mkws_config() { /* default mkws config */