X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=aced7e29eb57d0f588203f51045a14d17f7bdcbe;hb=52099b8e0246b1a8977920a584710a7b6521513d;hp=baf954f8a895cf1e852dff162e8adc61ed76dd68;hpb=900029b87d82984dfa7e9be6778f37bc9c1181eb;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index baf954f..aced7e2 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -158,21 +158,25 @@ function widget($, team, type, node) { var M = mkws.M; - if (type === 'Targets') { - promoteTargets(); - } else if (type === 'Stat') { - promoteStat(); - } else if (type === 'Termlists') { - promoteTermlists(); - } else if (type === 'Pager') { - promotePager(); - } else if (type === 'Records') { - promoteRecords(); + var type2fn = { + Targets: promoteTargets, + Stat: promoteStat, + Termlists: promoteTermlists, + Pager: promotePager, + Records: promoteRecords, + Navi: promoteNavi, + Sort: promoteSort, + Perpage: promotePerpage + }; + + var promote = type2fn[type]; + if (promote) { + promote(); + team.debug("made " + type + " widget(node=" + node + ")"); } else { - // ### Handle other types here + team.debug("made UNENCAPSULATED widget(type=" + type + ", node=" + node + ")"); } - mkws.debug("made widget(team=" + team.name() + ", type=" + type + ", node=" + node); return that; @@ -182,8 +186,6 @@ function widget($, team, type, node) { function promoteTargets() { team.queue("targets").subscribe(function(data) { - if (node.length === 0) alert("huh?!"); - var table ='' + '' + '' + @@ -355,7 +357,7 @@ function widget($, team, type, node) { // from the team object into this widget. if (hit.recid == team.currentRecordId()) { if (team.currentRecordData()) - html.push(renderDetails(team.currentRecordData())); + html.push(team.renderDetails(team.currentRecordData())); } } $(node).html(html.join('')); @@ -369,6 +371,61 @@ function widget($, team, type, node) { } }); } + + + function promoteNavi() { + team.queue("navi").subscribe(function() { + var filters = team.filters(); + var text = ""; + + for (var i in filters) { + if (text) { + text += " | "; + } + var filter = filters[i]; + if (filter.id) { + text += M('source') + ': ' + filter.name + ''; + } else { + text += M(filter.field) + ': ' + filter.value + ''; + } + } + + $(node).html(text); + }); + } + + + function promoteSort() { + team.queue("navi").subscribe(function() {}) + $(node).change(onSortChange); + + function onSortChange() + { + team.set_sortOrder($(node).val()); + if (!team.submitted()) return false; + team.resetPage(); + team.reShow(); + return false; + } + } + + + function promotePerpage() { + team.queue("navi").subscribe(function() {}) + $(node).change(onPerpageChange); + + function onPerpageChange() + { + team.set_perpage($(node).val()); + if (!team.submitted()) return false; + team.resetPage(); + team.reShow(); + return false; + } + } } @@ -401,11 +458,17 @@ function team($, teamName) { var m_template = {}; that.name = function() { return m_teamName; } + that.submitted = function() { return m_submitted; } that.perpage = function() { return m_perpage; } that.totalRecordCount = function() { return m_totalRecordCount; } that.currentPage = function() { return m_currentPage; } that.currentRecordId = function() { return m_currentRecordId; } that.currentRecordData = function() { return m_currentRecordData; } + that.filters = function() { return m_filters; } + + that.set_sortOrder = function(val) { m_sortOrder = val }; + that.set_perpage = function(val) { m_perpage = val }; + var debug = function (s) { var now = $.now(); @@ -414,6 +477,7 @@ function team($, teamName) { mkws.debug(m_teamName + ": " + timestamp + s); } + that.debug = debug; debug("start running MKWS"); @@ -523,74 +587,87 @@ function team($, teamName) { } m_filters = [] - redrawNavi(); - resetPage(); - loadSelect(); triggerSearch(query, sortOrder, targets); switchView('records'); // In case it's configured to start off as hidden m_submitted = true; } - function onSelectDdChange() + // limit by target functions + that.limitTarget = function (id, name) { - if (!m_submitted) return false; - resetPage(); - loadSelect(); - m_paz.show(0, m_perpage, m_sortOrder); + debug("limitTarget(id=" + id + ", name=" + name + ")"); + m_filters.push({ id: id, name: name }); + triggerSearch(); return false; } - function redrawNavi () + // limit the query after clicking the facet + that.limitQuery = function (field, value) { - var navi = findnode('.mkwsNavi'); - if (!navi) return; + debug("limitQuery(field=" + field + ", value=" + value + ")"); + m_filters.push({ field: field, value: value }); + triggerSearch(); + return false; + } + - var text = ""; + that.delimitTarget = function (id) + { + debug("delimitTarget(id=" + id + ")"); + var newFilters = []; for (var i in m_filters) { - if (text) { - text += " | "; - } var filter = m_filters[i]; if (filter.id) { - text += M('source') + ': ' + filter.name + ''; + debug("delimitTarget() removing filter " + $.toJSON(filter)); } else { - text += M(filter.field) + ': ' + filter.value + ''; + debug("delimitTarget() keeping filter " + $.toJSON(filter)); + newFilters.push(filter); } } + m_filters = newFilters; - navi.html(text); + triggerSearch(); + return false; } - function resetPage() + that.delimitQuery = function (field, value) { - m_currentPage = 1; - m_totalRecordCount = 0; + debug("delimitQuery(field=" + field + ", value=" + value + ")"); + var newFilters = []; + for (var i in m_filters) { + var filter = m_filters[i]; + if (filter.field && + field == filter.field && + value == filter.value) { + debug("delimitQuery() removing filter " + $.toJSON(filter)); + } else { + debug("delimitQuery() keeping filter " + $.toJSON(filter)); + newFilters.push(filter); + } + } + m_filters = newFilters; + + triggerSearch(); + return false; } - function loadSelect () + function resetPage() { - var node = findnode('.mkwsSort'); - if (node.length && node.val() != m_sortOrder) { - debug("changing m_sortOrder from " + m_sortOrder + " to " + node.val()); - m_sortOrder = node.val(); - } - node = findnode('.mkwsPerpage'); - if (node.length && node.val() != m_perpage) { - debug("changing m_perpage from " + m_perpage + " to " + node.val()); - m_perpage = node.val(); - } + m_currentPage = 1; + m_totalRecordCount = 0; } + that.resetPage = resetPage; function triggerSearch (query, sortOrder, targets) { + resetPage(); + queue("navi").publish(); + var pp2filter = ""; var pp2limit = ""; @@ -636,79 +713,11 @@ function team($, teamName) { } - // limit by target functions - that.limitTarget = function (id, name) - { - debug("limitTarget(id=" + id + ", name=" + name + ")"); - m_filters.push({ id: id, name: name }); - redrawNavi(); - resetPage(); - loadSelect(); - triggerSearch(); - return false; - } - - - // limit the query after clicking the facet - that.limitQuery = function (field, value) - { - debug("limitQuery(field=" + field + ", value=" + value + ")"); - m_filters.push({ field: field, value: value }); - redrawNavi(); - resetPage(); - loadSelect(); - triggerSearch(); - return false; - } - - - that.delimitTarget = function (id) - { - debug("delimitTarget(id=" + id + ")"); - var newFilters = []; - for (var i in m_filters) { - var filter = m_filters[i]; - if (filter.id) { - debug("delimitTarget() removing filter " + $.toJSON(filter)); - } else { - debug("delimitTarget() keeping filter " + $.toJSON(filter)); - newFilters.push(filter); - } - } - m_filters = newFilters; - - redrawNavi(); - resetPage(); - loadSelect(); - triggerSearch(); - return false; + that.reShow = function() { + m_paz.show(0, m_perpage, m_sortOrder); } - that.delimitQuery = function (field, value) - { - debug("delimitQuery(field=" + field + ", value=" + value + ")"); - var newFilters = []; - for (var i in m_filters) { - var filter = m_filters[i]; - if (filter.field && - field == filter.field && - value == filter.value) { - debug("delimitQuery() removing filter " + $.toJSON(filter)); - } else { - debug("delimitQuery() keeping filter " + $.toJSON(filter)); - newFilters.push(filter); - } - } - m_filters = newFilters; - - redrawNavi(); - resetPage(); - loadSelect(); - triggerSearch(); - return false; - } - that.showPage = function (pageNum) { @@ -763,8 +772,6 @@ function team($, teamName) { alert("Unknown view '" + view + "'"); } } - - that.switchView = switchView; @@ -820,8 +827,7 @@ function team($, teamName) { // .mkwsPager // .mkwsNavi // .mkwsRecords - if (findnode(".mkwsResults").length) { - findnode(".mkwsResults").html('\ + findnode(".mkwsResults").html('\
' + M('Target ID') + '' + M('Hits') + '
\ \ \ \
\ @@ -840,43 +846,27 @@ function team($, teamName) {
'); - } - var node = findnode(".mkwsRanking"); - if (node.length) { - var ranking_data = ''; - ranking_data += '
'; - if (mkws_config.show_sort) { - ranking_data += M('Sort by') + ' ' + mkwsHtmlSort() + ' '; - } - if (mkws_config.show_perpage) { - ranking_data += M('and show') + ' ' + mkwsHtmlPerpage() + ' ' + M('per page') + '.'; - } - ranking_data += '
'; - - node.html(ranking_data); + var ranking_data = '
'; + if (mkws_config.show_sort) { + ranking_data += M('Sort by') + ' ' + mkwsHtmlSort() + ' '; } + if (mkws_config.show_perpage) { + ranking_data += M('and show') + ' ' + mkwsHtmlPerpage() + ' ' + M('per page') + '.'; + } + ranking_data += '
'; + findnode(".mkwsRanking").html(ranking_data); mkwsHtmlSwitch(); - var node; - node = findnode('.mkwsSearchForm'); - if (node.length) - node.submit(onFormSubmitEventHandler); - node = findnode('.mkwsSort'); - if (node.length) - node.change(onSelectDdChange); - node = findnode('.mkwsPerpage'); - if (node.length) - node.change(onSelectDdChange); + findnode('.mkwsSearchForm').submit(onFormSubmitEventHandler); // on first page, hide the termlist $(document).ready(function() { findnode(".mkwsTermlists").hide(); }); - var motd = findnode(".mkwsMOTD"); var container = findnode(".mkwsMOTDContainer"); - if (motd.length && container.length) { + if (container.length) { // Move the MOTD from the provided element down into the container - motd.appendTo(container); + findnode(".mkwsMOTD").appendTo(container); } } @@ -1068,6 +1058,7 @@ function team($, teamName) { var details = template(data); return '
' + details + '
'; } + that.renderDetails = renderDetails; function loadTemplate(name) @@ -1115,7 +1106,6 @@ function team($, teamName) { } return queues[id]; } - that.queue = queue; @@ -1505,7 +1495,7 @@ function team($, teamName) { // Second pass: make the individual widget objects. This has // to be done separately, and after the team-creation, since // that sometimes makes new widget nodes (e.g. creating - // mkwsTermlists instead mkwsResults. + // mkwsTermlists inside mkwsResults. $('[class^="mkws"],[class*=" mkws"]').each(function () { mkws.handleNodeWithTeam(this, function(tname, type) { var myTeam = mkws.teams[tname];