X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=c06cde1f63830476642290e13071381e5ea86f44;hb=dac373f1720a66428b3d0bf0515ab72f93cdda00;hp=da6e4d86395026bb937ebb2472f77474d8b2c0e0;hpb=190a3a6a267bf7bc10d244ff80295e9caf2e10cf;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index da6e4d8..c06cde1 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -164,7 +164,9 @@ function widget($, team, type, node) { Termlists: promoteTermlists, Pager: promotePager, Records: promoteRecords, - Navi: promoteNavi + Navi: promoteNavi, + Sort: promoteSort, + Perpage: promotePerpage }; var promote = type2fn[type]; @@ -184,8 +186,6 @@ function widget($, team, type, node) { function promoteTargets() { team.queue("targets").subscribe(function(data) { - if (node.length === 0) alert("huh?!"); - var table ='' + '' + '' + @@ -396,6 +396,36 @@ function widget($, team, type, node) { $(node).html(text); }); } + + + function promoteSort() { + $(node).change(onSortChange); + team.queue("navi").subscribe(function() {}) + + function onSortChange() + { + team.set_sortOrder($(node).val()); + if (!team.submitted()) return false; + team.resetPage(); + team.reShow(); + return false; + } + } + + + function promotePerpage() { + $(node).change(onPerpageChange); + team.queue("navi").subscribe(function() {}) + + function onPerpageChange() + { + team.set_perpage($(node).val()); + if (!team.submitted()) return false; + team.resetPage(); + team.reShow(); + return false; + } + } } @@ -428,6 +458,7 @@ 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; } @@ -435,6 +466,10 @@ function team($, teamName) { 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(); var timestamp = ((now - m_debugTime.start)/1000).toFixed(3) + " (+" + ((now - m_debugTime.last)/1000).toFixed(3) + ") " @@ -552,55 +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) { - queue("navi").publish(); + debug("limitQuery(field=" + field + ", value=" + value + ")"); + m_filters.push({ field: field, value: value }); + triggerSearch(); + return false; } - function resetPage() + that.delimitTarget = function (id) { - m_currentPage = 1; - m_totalRecordCount = 0; + 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; + + triggerSearch(); + return false; } - function loadSelect () + that.delimitQuery = function (field, value) { - 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(); + 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 resetPage() + { + m_currentPage = 1; + m_totalRecordCount = 0; + } + that.resetPage = resetPage; + + function triggerSearch (query, sortOrder, targets) { + resetPage(); + queue("navi").publish(); + var pp2filter = ""; var pp2limit = ""; @@ -646,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) { @@ -773,8 +772,6 @@ function team($, teamName) { alert("Unknown view '" + view + "'"); } } - - that.switchView = switchView; @@ -830,8 +827,7 @@ function team($, teamName) { // .mkwsPager // .mkwsNavi // .mkwsRecords - if (findnode(".mkwsResults").length) { - findnode(".mkwsResults").html('\ + findnode(".mkwsResults").html('\
' + M('Target ID') + '' + M('Hits') + '
\ \ \ \
\ @@ -850,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); } } @@ -1126,7 +1106,6 @@ function team($, teamName) { } return queues[id]; } - that.queue = queue; @@ -1516,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];