X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=00ad9c4b39b802a51b0ffb7feee1691c7c6939f7;hb=5191a2651f45fd50ca208298491adf1118e0c0d9;hp=b5f29a3177dda50b188984f5bcbcc740aa09fd66;hpb=aabb474fb1cbd6b9dae4ad2c6c27bc0fc6585434;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index b5f29a3..00ad9c4 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -88,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 + ' <<<'); } @@ -96,16 +97,27 @@ mkws.log = function(string) { }; -mkws.objectWithParent = function(parent) { - function thing() {} // Must be function so `prototype' works +// Translation function. +mkws.M = function(word) { + var lang = mkws.config.lang; - thing.prototype = parent; - var res = new thing(); - thing.prototype = null; - return res; + if (!lang || !mkws.locale_lang[lang]) + return word; + + return mkws.locale_lang[lang][word] || 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) { + 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) { mkws.widgetType2function[name] = fn; mkws.log("registered widget-type '" + name + "'"); @@ -116,15 +128,13 @@ mkws.promotionFunction = function(name) { }; -mkws.defaultMkwsConfig = function() { - // Define empty mkws_config for simple applications that don't define it. - if (mkws_config == null || typeof mkws_config != 'object') { - var mkws_config = {}; - } - - mkws.config = 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; - /* default mkws config */ var config_default = { use_service_proxy: true, pazpar2_url: "//mkws.indexdata.com/service-proxy/", @@ -146,23 +156,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}}\ + {{#mkws-if-any location having="md-subject"}}\ + \ + \ + \ + \ + {{/mkws-if-any}}\ + \ + \ + \ + \ +
{{mkws-translate "Title"}}\ + {{md-title}}\ + {{#if md-title-remainder}}\ + ({{md-title-remainder}})\ + {{/if}}\ + {{#if md-title-responsibility}}\ + {{md-title-responsibility}}\ + {{/if}}\ +
{{mkws-translate "Date"}}{{md-date}}
{{mkws-translate "Author"}}{{md-author}}
{{mkws-translate "Links"}}\ + {{#each md-electronic-url}}\ + Link{{mkws-index1}}\ + {{/each}}\ +
{{mkws-translate "Subject"}}\ + {{#mkws-first location having="md-subject"}}\ + {{#if md-subject}}\ + {{#mkws-commaList md-subject}}\ + {{this}}{{/mkws-commaList}}\ + {{/if}}\ + {{/mkws-first}}\ +
{{mkws-translate "Locations"}}\ + {{#mkws-commaList location}}\ + {{mkws-attr "@name"}}{{/mkws-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 '\ + \ + {{#mkws-first md-thumburl}}\ + {{../md-title}}\ + {{/mkws-first}}\ +
\ +
\ +'; } + + var s = "There is no default '" + name +"' template!"; + alert(s); + return s; }; @@ -185,6 +283,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); }; @@ -232,37 +334,42 @@ mkws.pagerNext = function(tname) { type = cname.replace(/^mkws/, ''); } } + + if (!teamName) teamName = "AUTO"; callback.call(node, teamName, type); } 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(); - for (var tname in mkws.teams) { - $(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlistContainer2.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(); + var threshhold = mkws.config.responsive_design_width; + var width = $(window).width(); + var from, to, method; + + if ((mkws.width === undefined || mkws.width > threshhold) && + width <= threshhold) { + from = "wide"; to = "narrow"; method = "hide"; + } else if ((mkws.width === undefined || mkws.width <= threshhold) && + width > threshhold) { + from = "narrow"; to = "wide"; method = "show"; + } + mkws.width = width; + + if (from) { + log("changing from " + from + " to " + to + ": " + width); for (var tname in mkws.teams) { - $(".mkwsTermlists.mkwsTeam_" + tname).appendTo($(".mkwsTermlistContainer1.mkwsTeam_" + tname)); - for(var i = 0; i < list.length; i++) { - $("." + list[i] + ".mkwsTeam_" + tname).show(); - } + var team = mkws.teams[tname]; + team.visitWidgets(function(t, w) { + var w1 = team.widget(t + "-Container-" + from); + var w2 = team.widget(t + "-Container-" + to); + if (w1) { + $(w1.node).hide(); + } + if (w2) { + $(w2.node).show(); + $(w.node).appendTo($(w2.node)); + } + }); + team.queue("resize-" + to).publish(); } } }; @@ -300,8 +407,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(); @@ -313,13 +422,38 @@ 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: reparsing"); + 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)) { @@ -332,6 +466,15 @@ mkws.pagerNext = function(tname) { } } + var lang = mkws.getParameterByName("lang") || mkws.config.lang; + if (!lang || !mkws.locale_lang[lang]) { + mkws.config.lang = "" + } else { + mkws.config.lang = lang; + } + + log("Locale 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); mkws.config.query_width = 50; @@ -365,15 +508,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(); @@ -385,19 +519,22 @@ 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"); + /* + for (var tName in mkws.teams) { + var myTeam = mkws.teams[tName] + log("TEAM '" + tName + "' = " + myTeam + " ..."); + myTeam.visitWidgets(function(t, w) { + log(" has widget of type '" + t + "': " + w); + }); + } + */ + if (mkws.config.use_service_proxy) { authenticateSession(mkws.config.service_proxy_auth, mkws.config.service_proxy_auth_domain,