X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=00185092266e95042500dd12284450f2ea6f68ab;hb=08572db1f1fc46d2d26ec63e93a7854529b4769c;hp=32dfcc7fba4ea17fc160227a966e7f19533fcb01;hpb=b192cd12d336f8229b99d06b7667114d6098f1e5;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index 32dfcc7..0018509 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -28,7 +28,7 @@ window.mkws = { "Subjects": "Schlagwörter", "Sources": "Daten und Quellen", "source": "datenquelle", - "Termlists": "Termlisten", + "Facets": "Termlisten", "Next": "Weiter", "Prev": "Zurück", "Search": "Suche", @@ -57,7 +57,7 @@ window.mkws = { "Subjects": "Emner", "Sources": "Kilder", "source": "kilder", - "Termlists": "Termlists", + "Facets": "Termlists", "Next": "Næste", "Prev": "Forrige", "Search": "Søg", @@ -132,6 +132,11 @@ mkws.getParameterByName = function(name, url) { mkws.registerWidgetType = function(name, fn) { + if(mkws._old2new.hasOwnProperty(name)) { + mkws.log("Warning: registerWidgetType old widget name: " + name + " => " + mkws._old2new[name]); + name = mkws._old2new[name]; + } + mkws.widgetType2function[name] = fn; mkws.log("registered widget-type '" + name + "'"); }; @@ -143,9 +148,7 @@ mkws.promotionFunction = function(name) { 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 = { @@ -156,7 +159,7 @@ mkws.setMkwsConfig = function(overrides) { service_proxy_auth: undefined, sp_auth_path: "service-proxy/", sp_auth_query: "command=auth&action=perconfig", - sp_auth_credentials: "XXX/XXX", // Should be undefined: see bug MKSP-125. + sp_auth_credentials: undefined, lang: "", sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]], perpage_options: [10, 20, 30, 50], @@ -295,6 +298,8 @@ mkws.log("Using window.name '" + window.name + "'"); 'MOTDContainer': 'motd-container', 'Perpage': 'per-page', 'SearchForm': 'search-form', + 'ReferenceUniverse': 'reference-universe', + 'Termlists': 'facets' }; // Annoyingly, there is no built-in way to invert a hash var _new2old = {}; @@ -304,6 +309,8 @@ mkws.log("Using window.name '" + window.name + "'"); } } + mkws._old2new = _old2new; + function handleNodeWithTeam(node, callback) { // First branch for DOM objects; second branch for jQuery objects var classes = node.className || node.attr('class'); @@ -341,7 +348,7 @@ mkws.log("Using window.name '" + window.name + "'"); 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 (node.getAttribute("autosearch")) { if (mkws.autoHasAuto || mkws.teams["AUTO"] && mkws.teams["AUTO"].config["query"]) { log("AUTO team already has a query, using unique team"); @@ -493,7 +500,6 @@ mkws.log("Using window.name '" + window.name + "'"); var myTeam = mkws.teams[tname]; if (!myTeam) { myTeam = mkws.teams[tname] = mkws.makeTeam($, tname); - log("made MKWS team '" + tname + "'"); } var oldHTML = this.innerHTML;