X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=d7764ddc7bb1318e473b3160171fd6d48727a5eb;hb=466c06ce3e322fbcb1bacb32aefd6be4c1dfcf8e;hp=a3e2dcf6fd1c5576f26702b790a302aff49cf60d;hpb=58e7a7c64104914f7eab3ae74fde1a22eab79a60;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index a3e2dcf..d7764dd 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -250,24 +250,19 @@ 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"); - if (pager) { - pager.innerHTML = ""; - pager.innerHTML +='
' + M('Displaying') + ': ' - + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) + - ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': ' - + data.total + ')
'; - drawPager(pager); + + var pager = $(".mkwsPager.mkwsTeam_" + m_teamName); + if (pager.length) { + pager.html(drawPager(data)) } // navi @@ -298,7 +293,7 @@ function team($, teamName) { function my_onstat(data, teamName) { - debug("stat for " + teamName); + debug("stat"); var stat = $('.mkwsStat.mkwsTeam_' + teamName); if (stat.length === 0) return; @@ -312,7 +307,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; @@ -369,7 +364,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 +378,7 @@ function team($, teamName) { function my_onbytarget(data, teamName) { - debug("target for " + teamName); + debug("target"); var targetDiv = $('.mkwsBytarget.mkwsTeam_' + teamName); if (!targetDiv) { return; @@ -425,13 +420,12 @@ function team($, teamName) { }); }); - if (document.mkwsSelect) { - debug("messing with mkwsSelect"); - if (document.mkwsSelect.mkwsSort) - document.mkwsSelect.mkwsSort.onchange = onSelectDdChange; - if (document.mkwsSelect.mkwsPerpage) - document.mkwsSelect.mkwsPerpage.onchange = onSelectDdChange; - } + var node = $('.mkwsSort.mkwsTeam_' + m_teamName); + if (node.length) + node.change(onSelectDdChange); + node = $('.mkwsPerpage.mkwsTeam_' + m_teamName); + if (node.length) + node.change(onSelectDdChange); } @@ -459,9 +453,9 @@ function team($, teamName) { m_filters = [] redraw_navi(); resetPage(); // ### the globals it resents should be indexed by windowid - loadSelect(); // ### should use windowid + loadSelect(); triggerSearch(query, sort, targets, windowid); - mkws.switchView(m_teamName, 'records'); // In case it's configured to start off as hidden + that.switchView('records'); // In case it's configured to start off as hidden m_submitted = true; } @@ -533,11 +527,15 @@ function team($, teamName) { function loadSelect () { - if (document.mkwsSelect) { - if (document.mkwsSelect.mkwsSort) - m_sort = document.mkwsSelect.mkwsSort.value; - if (document.mkwsSelect.mkwsPerpage) - m_recPerPage = document.mkwsSelect.mkwsPerpage.value; + var node = $('.mkwsSort.mkwsTeam_' + m_teamName); + if (node.length && node.val() != m_sort) { + debug("changing m_sort from " + m_sort + " to " + node.val()); + m_sort = node.val(); + } + node = $('.mkwsPerpage.mkwsTeam_' + m_teamName); + if (node.length && node.val() != m_recPerPage) { + debug("changing m_recPerPage from " + m_recPerPage + " to " + node.val()); + m_recPerPage = node.val(); } } @@ -568,15 +566,13 @@ function team($, teamName) { } - that.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 +589,18 @@ function team($, teamName) { } - that.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); } } @@ -641,8 +639,13 @@ function team($, teamName) { } - function drawPager (pagerDiv) + function drawPager (data) { + var s = '
' + M('Displaying') + ': ' + + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) + + ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': ' + + data.total + ')
'; + //client indexes pages from 1 but pz2 from 0 var onsides = 6; var pages = Math.ceil(m_totalRec / m_recPerPage); @@ -683,8 +686,10 @@ function team($, teamName) { if (lastClkbl < pages) postdots = '...'; - pagerDiv.innerHTML += '
' + s += '
' + prev + predots + middle + postdots + next + '
'; + + return s; } @@ -711,13 +716,11 @@ function team($, teamName) { // switching view between targets and records - mkws.switchView = function(tname, view) { - debug("switchView(" + tname + ", " + view + ")"); - - var targets = $('.mkwsTargets.mkwsTeam_' + tname); - var results = $('.mkwsResults.mkwsTeam_' + tname + ',.mkwsRecords.mkwsTeam_' + tname); - var blanket = $('.mkwsBlanket.mkwsTeam_' + tname); - var motd = $('.mkwsMOTD.mkwsTeam_' + tname); + that.switchView = function(view) { + var targets = $('.mkwsTargets.mkwsTeam_' + m_teamName); + var results = $('.mkwsResults.mkwsTeam_' + m_teamName + ',.mkwsRecords.mkwsTeam_' + m_teamName); + var blanket = $('.mkwsBlanket.mkwsTeam_' + m_teamName); + var motd = $('.mkwsMOTD.mkwsTeam_' + m_teamName); switch(view) { case 'targets': @@ -733,7 +736,7 @@ function team($, teamName) { if (motd) motd.css('display', 'none'); break; case 'none': - alert("mkws.switchView(" + tname + ", 'none') shouldn't happen"); + alert("mkws.switchView(" + m_teamName + ", 'none') shouldn't happen"); if (targets) targets.css('display', 'none'); if (results) results.css('display', 'none'); if (blanket) blanket.css('display', 'none'); @@ -764,6 +767,7 @@ function team($, teamName) { return; } // request the record + debug("showDetails() requesting record '" + recId + "'"); m_paz.record(recId); } @@ -931,9 +935,10 @@ function team($, teamName) { '); } - if ($("#mkwsRanking").length) { + var node = $(".mkwsRanking.mkwsTeam_" + m_teamName); + if (node.length) { var ranking_data = ''; - ranking_data += '
'; + ranking_data += ''; if (mkws_config.show_sort) { ranking_data += M('Sort by') + ' ' + mkws_html_sort() + ' '; } @@ -942,7 +947,7 @@ function team($, teamName) { } ranking_data += '
'; - $("#mkwsRanking").html(ranking_data); + node.html(ranking_data); } mkws_html_switch(); @@ -955,15 +960,12 @@ function team($, teamName) { $(document).ready(function() { mkws.resize_page() }); } - debug("before domReady()"); domReady(); - debug("after domReady()"); // on first page, hide the termlist $(document).ready(function() { $(".mkwsTermlists.mkwsTeam_" + m_teamName).hide(); }); var motd = $(".mkwsMOTD.mkwsTeam_" + m_teamName); var container = $(".mkwsMOTDContainer.mkwsTeam_" + m_teamName); - debug("for team '" + m_teamName + "', motd=" + motd + "(" + motd.length + "), container=" + container + "(" + container.length + ")"); if (motd.length && container.length) { // Move the MOTD from the provided element down into the container motd.appendTo(container); @@ -1017,7 +1019,7 @@ function team($, teamName) { function mkws_html_sort() { debug("HTML sort, m_sort = '" + m_sort + "'"); - var sort_html = ''; for(var i = 0; i < mkws_config.sort_options.length; i++) { var opt = mkws_config.sort_options[i]; @@ -1038,7 +1040,7 @@ function team($, teamName) { function mkws_html_perpage() { debug("HTML perpage"); - var perpage_html = ''; for(var i = 0; i < mkws_config.perpage_options.length; i++) { var key = mkws_config.perpage_options[i]; @@ -1283,57 +1285,6 @@ function _mkws_jquery_plugin ($) { // enable before page load, so we could call it before mkws() runs _mkws_jquery_plugin(j); - $(document).ready(function() { - log("on load ready"); - default_mkws_config(); - - // Backwards compatibility: set new magic class names on any - // elements that have the old magic IDs. - var ids = [ "Switch", "Lang", "Search", "Pager", "Navi", - "Results", "Records", "Targets", "Ranking", - "Termlists", "Stat" ]; - for (var i = 0; i < ids.length; i++) { - var id = 'mkws' + ids[i]; - var node = $('#' + id); - if (node.attr('id')) { - node.addClass(id); - log("added magic class to '" + node.attr('id') + "'"); - } - } - - // For all MKWS-classed nodes that don't have a team - // specified, set the team to AUTO. - $('[class^="mkws"],[class*=" mkws"]').each(function () { - if (!this.className.match(/mkwsTeam_/)) { - log("adding AUTO team to node with class '" + this.className + "'"); - $(this).addClass('mkwsTeam_AUTO'); - } - }); - - // Find all nodes with an class, and determine their team from - // the mkwsTeam_* class. Make all team objects. - $('[class^="mkws"],[class*=" mkws"]').each(function () { - var node = this; - mkws.handle_node_with_team(node, function(tname) { - if (mkws.teams[tname]) { - log("MKWS team '" + tname + "' already exists, skipping"); - } else { - mkws.teams[tname] = team(j, tname); - log("Made MKWS team '" + tname + "'"); - } - }); - }); - - if (mkws_config.use_service_proxy) { - authenticate_session(mkws_config.service_proxy_auth, - mkws_config.service_proxy_auth_domain, - mkws_config.pazpar2_url); - } else { - // raw pp2 - run_auto_searches(); - } - }); - mkws.handle_node_with_team = function(node, callback) { var classes = node.className; @@ -1381,6 +1332,10 @@ function _mkws_jquery_plugin ($) { }; + mkws.switchView = function(tname, view) { + mkws.teams[tname].switchView(view); + } + mkws.showDetails = function (tname, prefixRecId) { mkws.teams[tname].showDetails(prefixRecId); } @@ -1401,6 +1356,7 @@ function _mkws_jquery_plugin ($) { mkws.teams[tname].delimitQuery(field, value); } + function default_mkws_config() { /* default mkws config */ var config_default = { @@ -1505,4 +1461,54 @@ function _mkws_jquery_plugin ($) { } } } + + + $(document).ready(function() { + log("on load ready"); + default_mkws_config(); + + // Backwards compatibility: set new magic class names on any + // elements that have the old magic IDs. + var ids = [ "Switch", "Lang", "Search", "Pager", "Navi", + "Results", "Records", "Targets", "Ranking", + "Termlists", "Stat" ]; + for (var i = 0; i < ids.length; i++) { + var id = 'mkws' + ids[i]; + var node = $('#' + id); + if (node.attr('id')) { + node.addClass(id); + log("added magic class to '" + node.attr('id') + "'"); + } + } + + // For all MKWS-classed nodes that don't have a team + // specified, set the team to AUTO. + $('[class^="mkws"],[class*=" mkws"]').each(function () { + if (!this.className.match(/mkwsTeam_/)) { + log("adding AUTO team to node with class '" + this.className + "'"); + $(this).addClass('mkwsTeam_AUTO'); + } + }); + + // Find all nodes with an class, and determine their team from + // the mkwsTeam_* class. Make all team objects. + $('[class^="mkws"],[class*=" mkws"]').each(function () { + var node = this; + mkws.handle_node_with_team(node, function(tname) { + if (!mkws.teams[tname]) { + mkws.teams[tname] = team(j, tname); + log("Made MKWS team '" + tname + "'"); + } + }); + }); + + if (mkws_config.use_service_proxy) { + authenticate_session(mkws_config.service_proxy_auth, + mkws_config.service_proxy_auth_domain, + mkws_config.pazpar2_url); + } else { + // raw pp2 + run_auto_searches(); + } + }); })(jQuery);