X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=3c2ff2ae69aa815ebaf611329febda983ef7fe8c;hb=e775ddeb55acb3ead4c5e7f6e1ed0b601f91f5f4;hp=6371339845f902f601bc2882292eb1396cff1f10;hpb=d662af47d6eb8b1a1994a4fa817291af698d8d97;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index 6371339..3c2ff2a 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -9,7 +9,10 @@ // Set up global mkws object. Contains truly global state such as SP // authentication, and a hash of team objects, indexed by team-name. // -var mkws = { +// We set it as a property of window to make the global explicit as +// some things complain about an implicit global. +window.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. @@ -77,6 +80,12 @@ var mkws = { } }; +// We may be using a separate copy +if (typeof(mkws_jQuery) !== "undefined") { + mkws.$ = mkws_jQuery; +} else { + mkws.$ = jQuery; +} mkws.log = function(string) { if (!mkws.log_level) @@ -97,6 +106,24 @@ mkws.log = function(string) { }; +// Incredible that the standard JavaScript runtime doesn't define a +// unique windowId. Instead, we have to make one up. And since there's +// no global area shared between windows, the best we can do for +// ensuring uniqueness is generating a random ID and crossing our +// fingers. We stash this in window.name, as it's the only place to +// keep data that is preserved across reloads and within-site +// navigation. pz2.js picks this up and uses it as part of the +// cookie-name, to ensure each tab gets its own session. +if (window.name) { + mkws.log("Using existing window.name '" + window.name + "'"); +} else { + // Ten chars from 26 alpha-numerics = 36^10 = 3.65e15 combinations. + // At one per second, it will take 116 million years to duplicate a session + window.name = Math.random().toString(36).slice(2, 12); + mkws.log("Generated new window.name '" + window.name + "'"); +} + + // Translation function. mkws.M = function(word) { var lang = mkws.config.lang; @@ -110,10 +137,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, " ")); } @@ -137,8 +165,12 @@ mkws.setMkwsConfig = function(overrides) { var config_default = { use_service_proxy: true, - pazpar2_url: "//mkws.indexdata.com/service-proxy/", - service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth", + pazpar2_url: "//mkws.indexdata.com/service-proxy/", + service_proxy_auth: undefined, // generally rolled from the next three properties + // Was: //mkws.indexdata.com/service-proxy-auth + pp2_hostname: "mkws.indexdata.com", + sp_path: "service-proxy-auth", + credentials: undefined, lang: "", sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]], perpage_options: [10, 20, 30, 50], @@ -147,7 +179,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 */ @@ -246,6 +279,14 @@ mkws.defaultTemplate = function(name) { {{#if md-title-responsibility}}\ {{md-title-responsibility}}\ {{/if}}\ +{{#if md-date}}, {{md-date}}\ +{{#if location}}\ +, {{#mkws-first location}}{{mkws-attr "@name"}}{{/mkws-first}}\ +{{/if}}\ +{{#if md-medium}}\ +, {{md-medium}}\ +{{/if}}\ +{{/if}}\ '; } else if (name === "Image") { return '\ @@ -256,11 +297,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,8 +356,8 @@ 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; function handleNodeWithTeam(node, callback) { @@ -335,7 +383,26 @@ mkws.pagerNext = function(tname) { } } - if (!teamName) teamName = "AUTO"; + // Widgets without a team are on team "AUTO" + if (!teamName) { + teamName = "AUTO"; + // Autosearch widgets don't join team AUTO if there is already an + // autosearch on the team or the team has otherwise gotten a query + if (node.hasAttribute("autosearch")) { + if (mkws.autoHasAuto || + mkws.teams["AUTO"] && mkws.teams["AUTO"].config["query"]) { + log("AUTO team already has a query, using unique team"); + teamName = "UNIQUE"; + } + mkws.autoHasAuto = true; + } + } + + // Widgets on team "UNIQUE" get a random team + if (teamName === "UNIQUE") { + teamName = Math.floor(Math.random() * 100000000).toString(); + } + callback.call(node, teamName, type); } @@ -362,11 +429,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(); @@ -381,7 +448,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'); @@ -395,16 +462,17 @@ mkws.pagerNext = function(tname) { request.get(null, function(data) { if (!$.isXMLDoc(data)) { - alert("service proxy auth response document is not valid XML document, give up!"); + alert("Service Proxy authentication response is not a valid XML document"); return; } var status = $(data).find("status"); if (status.text() != "OK") { - alert("service proxy auth response status: " + status.text() + ", give up!"); + var message = $(data).find("message"); + alert("Service Proxy authentication response: " + status.text() + " (" + message.text() + ")"); 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,7 +496,7 @@ mkws.pagerNext = function(tname) { function selectorForAllWidgets() { - if (mkws.config.scan_all_nodes) { + 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 @@ -439,14 +507,16 @@ mkws.pagerNext = function(tname) { return '[class^="mkws"],[class*=" mkws"]'; } else { // This is the new version, which works by looking up the - // specific classes of all registered widget types. 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. + // 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; } @@ -458,12 +528,12 @@ mkws.pagerNext = function(tname) { handleNodeWithTeam(this, function(tname, type) { var myTeam = mkws.teams[tname]; if (!myTeam) { - myTeam = mkws.teams[tname] = team(j, tname); - log("Made MKWS team '" + tname + "'"); + myTeam = mkws.teams[tname] = team($, tname); + log("made MKWS team '" + tname + "'"); } var oldHTML = this.innerHTML; - var myWidget = widget(j, myTeam, type, this); + var myWidget = widget($, myTeam, type, this); myTeam.addWidget(myWidget); var newHTML = this.innerHTML; if (newHTML !== oldHTML) { @@ -475,7 +545,9 @@ mkws.pagerNext = function(tname) { } - $(document).ready(function() { + function init(rootsel) { + mkws.autoHasAuto = false; + if (!rootsel) var rootsel = ':root'; var saved_config; if (typeof mkws_config === 'undefined') { log("setting empty config"); @@ -492,7 +564,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 + "'"); } } } @@ -504,17 +576,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) { @@ -540,28 +612,52 @@ mkws.pagerNext = function(tname) { } var then = $.now(); - 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); }); } */ + function sp_auth_url(config) { + if (config.service_proxy_auth) { + mkws.log("using pre-baked sp_auth_url '" + config.service_proxy_auth + "'"); + return config.service_proxy_auth; + } else { + var s = '//'; + s += config.auth_hostname ? config.auth_hostname : config.pp2_hostname; + s += '/' + config.sp_path + '?command=auth&action=perconfig'; + var c = config.credentials; + if (c) { + if (c) { + s += ('&username=' + c.substr(0, c.indexOf('/')) + + '&password=' + c.substr(c.indexOf('/')+1)); + } + } + mkws.log("generated sp_auth_url '" + s + "'"); + return s; + } + } + if (mkws.config.use_service_proxy) { - authenticateSession(mkws.config.service_proxy_auth, + authenticateSession(sp_auth_url(mkws.config), mkws.config.service_proxy_auth_domain, mkws.config.pazpar2_url); } else { // raw pp2 runAutoSearches(); } + }; + $(document).ready(function() { + var widgetSelector = selectorForAllWidgets(); + if (widgetSelector && $(widgetSelector).length !== 0) init(); }); -})(jQuery); +})(mkws.$);