X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=8d19f3a0d133a010e6c50f5fcfabe0d754ef5861;hb=383378d6a66b3b00bb540e2c1738d18d470b557e;hp=893951cbacc001adb4066f1dd9da5800a6015a6e;hpb=86f25a52eba4a79b06c614fee9279ea583b1d549;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index 893951c..8d19f3a 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -11,7 +11,7 @@ // var mkws = { authenticated: false, - log_level: 1, // Will be overridden from mkws_config, but + log_level: 1, // Will be overridden from mkws.config, but // initial value allows jQuery popup to use logging. teams: {}, widgetType2function: {}, @@ -78,12 +78,6 @@ var mkws = { }; -// Define empty mkws_config for simple applications that don't define it. -if (mkws_config == null || typeof mkws_config != 'object') { - var mkws_config = {}; -} - - mkws.log = function(string) { if (!mkws.log_level) return; @@ -94,7 +88,8 @@ mkws.log = function(string) { // you need to disable use strict at the top of the file!!! if (mkws.log_level >= 3) { - console.log(arguments.callee.caller); + // Works in Chrome; not sure about elsewhere + console.trace(); } else if (mkws.log_level >= 2) { console.log(">>> called from function " + arguments.callee.caller.name + ' <<<'); } @@ -102,14 +97,14 @@ mkws.log = function(string) { }; -mkws.objectWithParent = function(parent) { - function thing() {} // Must be function so `prototype' works - - thing.prototype = parent; - var res = new thing(); - thing.prototype = null; - return res; -}; +// 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) { + name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]"); + var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"), + results = regex.exec(location.search); + return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); +} mkws.registerWidgetType = function(name, fn) { @@ -122,8 +117,13 @@ mkws.promotionFunction = function(name) { }; -mkws.defaultMkwsConfig = function() { - /* default mkws config */ +mkws.setMkwsConfig = function(overrides) { + // Set global log_level flag early so that mkws.log() works + // Fall back to old "debug_level" setting for backwards compatibility + var tmp = overrides.log_level; + if (typeof(tmp) === 'undefined') tmp = overrides.debug_level; + if (typeof(tmp) !== 'undefined') mkws.log_level = tmp; + var config_default = { use_service_proxy: true, pazpar2_url: "//mkws.indexdata.com/service-proxy/", @@ -145,23 +145,111 @@ mkws.defaultMkwsConfig = function() { dummy: "dummy" }; - // Set global log_level flag early so that log() works - // Fall back to old "debug_level" setting for backwards compatibility - var tmp = mkws_config.log_level; - if (typeof(tmp) === 'undefined') tmp = mkws_config.debug_level; - - if (typeof(tmp) !== 'undefined') { - mkws.log_level = tmp; - } else if (typeof(config_default.log_level) !== 'undefined') { - mkws.log_level = config_default.log_level; + mkws.config = mkws.objectInheritingFrom(config_default); + for (var k in overrides) { + mkws.config[k] = overrides[k]; } +}; + - /* override standard config values by function parameters */ - for (var k in config_default) { - if (typeof mkws_config[k] === 'undefined') - mkws_config[k] = config_default[k]; - //log("Set config: " + k + ' => ' + mkws_config[k]); +// This code is from Douglas Crockford's article "Prototypal Inheritance in JavaScript" +// http://javascript.crockford.com/prototypal.html +// mkws.objectInheritingFrom behaves the same as Object.create, +// but since the latter is not available in IE8 we can't use it. +// +mkws.objectInheritingFrom = function(o) { + function F() {} + F.prototype = o; + return new F(); +} + + +mkws.defaultTemplate = function(name) { + if (name === 'Record') { + return '\ +\ + \ + \ + \ + \ + {{#if md-date}}\ + \ + \ + \ + \ + {{/if}}\ + {{#if md-author}}\ + \ + \ + \ + \ + {{/if}}\ + {{#if md-electronic-url}}\ + \ + \ + \ + \ + {{/if}}\ + {{#if-any location having="md-subject"}}\ + \ + \ + \ + \ + {{/if-any}}\ + \ + \ + \ + \ +
{{translate "Title"}}\ + {{md-title}}\ + {{#if md-title-remainder}}\ + ({{md-title-remainder}})\ + {{/if}}\ + {{#if md-title-responsibility}}\ + {{md-title-responsibility}}\ + {{/if}}\ +
{{translate "Date"}}{{md-date}}
{{translate "Author"}}{{md-author}}
{{translate "Links"}}\ + {{#each md-electronic-url}}\ + Link{{index1}}\ + {{/each}}\ +
{{translate "Subject"}}\ + {{#first location having="md-subject"}}\ + {{#if md-subject}}\ + {{#commaList md-subject}}\ + {{this}}{{/commaList}}\ + {{/if}}\ + {{/first}}\ +
{{translate "Locations"}}\ + {{#commaList location}}\ + {{attr "@name"}}{{/commaList}}\ +
\ +'; + } else if (name === "Summary") { + return '\ +\ + {{md-title}}\ +\ +{{#if md-title-remainder}}\ + {{md-title-remainder}}\ +{{/if}}\ +{{#if md-title-responsibility}}\ + {{md-title-responsibility}}\ +{{/if}}\ +'; + } else if (name === "Image") { + return '\ + \ + {{#first md-thumburl}}\ + {{../md-title}}\ + {{/first}}\ +
\ + \ +'; } + + var s = "There is no default '" + name +"' template!"; + alert(s); + return s; }; @@ -184,6 +272,10 @@ mkws.limitQuery = function(tname, field, value) { mkws.teams[tname].limitQuery(field, value); }; +mkws.limitCategory = function(tname, id) { + mkws.teams[tname].limitCategory(id); +}; + mkws.delimitTarget = function(tname, id) { mkws.teams[tname].delimitTarget(id); }; @@ -231,6 +323,8 @@ mkws.pagerNext = function(tname) { type = cname.replace(/^mkws/, ''); } } + + if (!teamName) teamName = "AUTO"; callback.call(node, teamName, type); } @@ -238,27 +332,43 @@ mkws.pagerNext = function(tname) { function resizePage() { var list = ["mkwsSwitch", "mkwsLang"]; - var width = mkws_config.responsive_design_width; var parent = $(".mkwsTermlists").parent(); - - if ($(window).width() <= width && - parent.hasClass("mkwsTermlistContainer1")) { - log("changing from wide to narrow: " + $(window).width()); - $(".mkwsTermlistContainer1").hide(); - $(".mkwsTermlistContainer2").show(); + var targetWidth = mkws.config.responsive_design_width; + var width = $(window).width(); + + if (mkws.width === undefined) { + // No state change, since we have no previous state + } else if (mkws.width <= targetWidth && width > targetWidth) { + log("narrow -> wide"); + } else if (mkws.width > targetWidth && width <= targetWidth) { + log("wide -> narrow"); + } else if (width > targetWidth) { + log("already wide"); + } else { + log("already narrow"); + } + mkws.width = width; + + if (width <= targetWidth && + parent.hasClass("mkwsTermlist-Container-wide")) { + log("changing from wide to narrow: " + width); + $(".mkwsTermlist-Container-wide").hide(); + $(".mkwsTermlist-Container-narrow").show(); for (var tname in mkws.teams) { - $(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlistContainer2.mkwsTeam_" + tname)); + mkws.teams[tname].queue("resize-narrow").publish(); + $(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlist-Container-narrow.mkwsTeam_" + tname)); for(var i = 0; i < list.length; i++) { $("." + list[i] + ".mkwsTeam_" + tname).hide(); } } - } else if ($(window).width() > width && - parent.hasClass("mkwsTermlistContainer2")) { - log("changing from narrow to wide: " + $(window).width()); - $(".mkwsTermlistContainer1").show(); - $(".mkwsTermlistContainer2").hide(); + } else if (width > targetWidth && + parent.hasClass("mkwsTermlist-Container-narrow")) { + log("changing from narrow to wide: " + width); + $(".mkwsTermlist-Container-wide").show(); + $(".mkwsTermlist-Container-narrow").hide(); for (var tname in mkws.teams) { - $(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlistContainer1.mkwsTeam_" + tname)); + mkws.teams[tname].queue("resize-wide").publish(); + $(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlist-Container-wide.mkwsTeam_" + tname)); for(var i = 0; i < list.length; i++) { $("." + list[i] + ".mkwsTeam_" + tname).show(); } @@ -299,8 +409,10 @@ mkws.pagerNext = function(tname) { log("Service proxy auth successfully done"); mkws.authenticated = true; var authName = $(data).find("displayName").text(); + // You'd think there would be a better way to do this: + var realm = $(data).find("realm:not(realmAttributes realm)").text(); for (var teamName in mkws.teams) { - mkws.teams[teamName].queue("authenticated").publish(authName); + mkws.teams[teamName].queue("authenticated").publish(authName, realm); } runAutoSearches(); @@ -312,37 +424,62 @@ mkws.pagerNext = function(tname) { log("running auto searches"); for (var teamName in mkws.teams) { - mkws.teams[teamName].runAutoSearch(); + mkws.teams[teamName].queue("ready").publish(); } } + function makeWidgetsWithin(level, node) { + node.find('[class^="mkws"],[class*=" mkws"]').each(function() { + handleNodeWithTeam(this, function(tname, type) { + var oldHTML = this.innerHTML; + var myTeam = mkws.teams[tname]; + var myWidget = widget(j, myTeam, type, this); + myTeam.addWidget(myWidget); + var newHTML = this.innerHTML; + if (newHTML !== oldHTML) { + log("widget " + tname + ":" + type + " HTML changed from '" + oldHTML + "' to '" + newHTML + "': reparse!"); + makeWidgetsWithin(level+1, $(this)); + } + }); + }); + } + + $(document).ready(function() { - mkws.defaultMkwsConfig(); + var saved_config; + if (typeof mkws_config === 'undefined') { + log("setting empty config"); + saved_config = {}; + } else { + log("using config: " + $.toJSON(mkws_config)); + saved_config = mkws_config; + } + mkws.setMkwsConfig(saved_config); - for (var key in mkws_config) { - if (mkws_config.hasOwnProperty(key)) { + for (var key in mkws.config) { + if (mkws.config.hasOwnProperty(key)) { if (key.match(/^language_/)) { var lang = key.replace(/^language_/, ""); // Copy custom languages into list - mkws.locale_lang[lang] = mkws_config[key]; + mkws.locale_lang[lang] = mkws.config[key]; log("Added locally configured language '" + lang + "'"); } } } - if (mkws_config.query_width < 5 || mkws_config.query_width > 150) { - log("Reset query width: " + mkws_config.query_width); - mkws_config.query_width = 50; + if (mkws.config.query_width < 5 || mkws.config.query_width > 150) { + log("Reset query width: " + 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); + 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); } - if (mkws_config.responsive_design_width) { + if (mkws.config.responsive_design_width) { // Responsive web design - change layout on the fly based on // current screen width. Required for mobile devices. $(window).resize(resizePage); @@ -364,15 +501,6 @@ mkws.pagerNext = function(tname) { } } - // 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 MKWS class, and determine their team from // the mkwsTeam_* class. Make all team objects. var then = $.now(); @@ -384,23 +512,26 @@ mkws.pagerNext = function(tname) { } }); }); - // 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 inside mkwsResults. - $('[class^="mkws"],[class*=" mkws"]').each(function() { - handleNodeWithTeam(this, function(tname, type) { - var myTeam = mkws.teams[tname]; - var myWidget = widget(j, myTeam, type, this); - }); - }); + + makeWidgetsWithin(1, $(':root')); + var now = $.now(); log("Walking MKWS nodes took " + (now-then) + " ms"); - if (mkws_config.use_service_proxy) { - authenticateSession(mkws_config.service_proxy_auth, - mkws_config.service_proxy_auth_domain, - mkws_config.pazpar2_url); +// for (var tName in mkws.teams) { +// var myTeam = mkws.teams[tName] +// var types = myTeam.widgetTypes(); +// log("TEAM '" + tName + "' = " + myTeam + " has widget types " + types); +// for (var i = 0; i < types.length; i++) { +// var type = types[i]; +// log(" has widget of type '" + type + "': " + myTeam.widget(type)); +// } +// } + + if (mkws.config.use_service_proxy) { + authenticateSession(mkws.config.service_proxy_auth, + mkws.config.service_proxy_auth_domain, + mkws.config.pazpar2_url); } else { // raw pp2 runAutoSearches();