X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=a8c0470c0cd1e511819df356b3e189984d2e8923;hb=0d381791dd8bd101ded339e2f832afb3d0ef6260;hp=c40a457178494b9da9fc94125e6cea967ff316ce;hpb=850469b03439f2416debdc2087fa1b530f4cf84e;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index c40a457..a8c0470 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -10,6 +10,7 @@ // authentication, and a hash of team objects, indexed by team-name. // var mkws = { + $: $, // Our own local copy of the jQuery object authenticated: false, log_level: 1, // Will be overridden from mkws.config, but // initial value allows jQuery popup to use logging. @@ -110,10 +111,11 @@ mkws.M = function(word) { // This function is taken from a StackOverflow answer // http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript/901144#901144 -mkws.getParameterByName = function(name) { +mkws.getParameterByName = function(name, url) { + if (!url) url = location.search; name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]"); var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"), - results = regex.exec(location.search); + results = regex.exec(url); return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); } @@ -147,7 +149,8 @@ mkws.setMkwsConfig = function(overrides) { query_width: 50, show_lang: true, /* show/hide language menu */ show_sort: true, /* show/hide sort menu */ - show_perpage: true, /* show/hide perpage menu */ + show_perpage: true, /* show/hide perpage menu */ + show_switch: true, /* show/hide switch menu */ lang_options: [], /* display languages links for given languages, [] for all */ facets: ["xtargets", "subject", "author"], /* display facets, in this order, [] for none */ responsive_design_width: undefined, /* a page with less pixel width considered as narrow */ @@ -256,11 +259,18 @@ mkws.defaultTemplate = function(name) {
\ \ '; + } else if (name === 'Facet') { + return '\ +{{term}}\ +{{count}}\ +'; } - var s = "There is no default '" + name +"' template!"; - alert(s); - return s; + return null; }; @@ -308,10 +318,9 @@ mkws.pagerNext = function(tname) { }; -// wrapper to call team() after page load -(function(j) { +// wrapper to provide local copy of the jQuery object. +(function($) { var log = mkws.log; - var $ = j; // XXX function handleNodeWithTeam(node, callback) { // First branch for DOM objects; second branch for jQuery objects @@ -363,11 +372,11 @@ mkws.pagerNext = function(tname) { var w1 = team.widget(t + "-Container-" + from); var w2 = team.widget(t + "-Container-" + to); if (w1) { - $(w1.node).hide(); + w1.node.hide(); } if (w2) { - $(w2.node).show(); - $(w.node).appendTo($(w2.node)); + w2.node.show(); + w.node.appendTo(w2.node); } }); team.queue("resize-" + to).publish(); @@ -382,7 +391,7 @@ mkws.pagerNext = function(tname) { * for the site. */ function authenticateSession(auth_url, auth_domain, pp2_url) { - log("Run service proxy auth URL: " + auth_url); + log("service proxy authentication on URL: " + auth_url); if (!auth_domain) { auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2'); @@ -405,7 +414,7 @@ mkws.pagerNext = function(tname) { return; } - log("Service proxy auth successfully done"); + log("service proxy authentication successful"); mkws.authenticated = true; var authName = $(data).find("displayName").text(); // You'd think there would be a better way to do this: @@ -428,12 +437,45 @@ mkws.pagerNext = function(tname) { } + function selectorForAllWidgets() { + if (mkws.config && mkws.config.scan_all_nodes) { + // This is the old version, which works by telling jQuery to + // find every node that has a class beginning with "mkws". In + // theory it should be slower than the class-based selector; but + // instrumentation suprisnigly shows this is consistently + // faster. It also has the advantage that any widgets of + // non-registered types are logged as warnings rather than + // silently ignored. + return '[class^="mkws"],[class*=" mkws"]'; + } else { + // This is the new version, which works by looking up the + // specific classes of all registered widget types and their + // resize containers. Because all it requires jQuery to do is + // some hash lookups in pre-built tables, it should be very + // fast; but it silently ignores widgets of unregistered types. + var s = ""; + for (var type in mkws.widgetType2function) { + if (s) s += ','; + s += '.mkws' + type; + s += ',.mkws' + type + "-Container-wide"; + s += ',.mkws' + type + "-Container-narrow"; + } + return s; + } + } + + function makeWidgetsWithin(level, node) { - node.find('[class^="mkws"],[class*=" mkws"]').each(function() { + node.find(selectorForAllWidgets()).each(function() { handleNodeWithTeam(this, function(tname, type) { - var oldHTML = this.innerHTML; var myTeam = mkws.teams[tname]; - var myWidget = widget(j, myTeam, type, this); + if (!myTeam) { + myTeam = mkws.teams[tname] = team($, tname); + log("made MKWS team '" + tname + "'"); + } + + var oldHTML = this.innerHTML; + var myWidget = widget($, myTeam, type, this); myTeam.addWidget(myWidget); var newHTML = this.innerHTML; if (newHTML !== oldHTML) { @@ -445,7 +487,8 @@ mkws.pagerNext = function(tname) { } - $(document).ready(function() { + function init(rootsel) { + if (!rootsel) var rootsel = ':root'; var saved_config; if (typeof mkws_config === 'undefined') { log("setting empty config"); @@ -462,7 +505,7 @@ mkws.pagerNext = function(tname) { var lang = key.replace(/^language_/, ""); // Copy custom languages into list mkws.locale_lang[lang] = mkws.config[key]; - log("Added locally configured language '" + lang + "'"); + log("added locally configured language '" + lang + "'"); } } } @@ -474,17 +517,17 @@ mkws.pagerNext = function(tname) { mkws.config.lang = lang; } - log("Locale language: " + (mkws.config.lang ? mkws.config.lang : "none")); + log("using language: " + (mkws.config.lang ? mkws.config.lang : "none")); if (mkws.config.query_width < 5 || mkws.config.query_width > 150) { - log("Reset query width: " + mkws.config.query_width); + log("reset query width to " + mkws.config.query_width); mkws.config.query_width = 50; } // protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp" if (mkws.config.pazpar2_url.match(/^\/\//)) { mkws.config.pazpar2_url = document.location.protocol + mkws.config.pazpar2_url; - log("adjust protocol independent links: " + mkws.config.pazpar2_url); + log("adjusted protocol independent link to " + mkws.config.pazpar2_url); } if (mkws.config.responsive_design_width) { @@ -509,27 +552,16 @@ mkws.pagerNext = function(tname) { } } - // Find all nodes with an MKWS class, and determine their team from - // the mkwsTeam_* class. Make all team objects. var then = $.now(); - $('[class^="mkws"],[class*=" mkws"]').each(function() { - handleNodeWithTeam(this, function(tname, type) { - if (!mkws.teams[tname]) { - mkws.teams[tname] = team(j, tname); - log("Made MKWS team '" + tname + "'"); - } - }); - }); - - makeWidgetsWithin(1, $(':root')); - + makeWidgetsWithin(1, $(rootsel)); var now = $.now(); - log("Walking MKWS nodes took " + (now-then) + " ms"); + + log("walking MKWS nodes took " + (now-then) + " ms"); /* for (var tName in mkws.teams) { var myTeam = mkws.teams[tName] - log("TEAM '" + tName + "' = " + myTeam + " ..."); + log("team '" + tName + "' = " + myTeam + " ..."); myTeam.visitWidgets(function(t, w) { log(" has widget of type '" + t + "': " + w); }); @@ -544,5 +576,9 @@ mkws.pagerNext = function(tname) { // raw pp2 runAutoSearches(); } + }; + $(document).ready(function() { + var widgetSelector = selectorForAllWidgets(); + if (widgetSelector && $(widgetSelector).length !== 0) init(); }); })(jQuery);