X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=753ffed5ac49d1b5720f40c962e1a4edd8a9d101;hb=ecaa075ace18ba78f16dedc4a77c4caf5bc6f7da;hp=c3085548009b1ed7b63b7f277c88467a2d42d385;hpb=6eff7e3d6c01e5733285cd6934af29b2161dc9e7;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index c308554..753ffed 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -13,8 +13,9 @@ var mkws = {
     authenticated: false,
     log_level: 1, // Will be overridden from mkws_config, but
                   // initial value allows jQuery popup to use logging.
-    paz: undefined, // will be set up during initialisation
     teams: {},
+    widgetType2function: {},
+
     locale_lang: {
 	"de": {
 	    "Authors": "Autoren",
@@ -85,7 +86,7 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 
 // wrapper to call team() after page load
 (function (j) {
-    mkws.log = function (string) {
+    function log(string) {
 	if (!mkws.log_level)
 	    return;
 
@@ -101,10 +102,20 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 	}
 	console.log(string);
     }
-    var log = mkws.log;
+    mkws.log = log;
+
+
+    mkws.registerWidgetType = function(name, fn) {
+	mkws.widgetType2function[name] = fn;
+	log("registered widget-type '" + name + "'");
+    }
+
+    mkws.promotionFunction = function(name) {
+	return mkws.widgetType2function[name];
+    }
 
 
-    mkws.handleNodeWithTeam = function(node, callback) {
+    function handleNodeWithTeam(node, callback) {
 	// First branch for DOM objects; second branch for jQuery objects
 	var classes = node.className || node.attr('class');
 	if (!classes) {
@@ -130,7 +141,7 @@ if (mkws_config == null || typeof mkws_config != 'object') {
     }
 
 
-    mkws.resizePage = function () {
+    function resizePage() {
 	var list = ["mkwsSwitch", "mkwsLang"];
 
 	var width = mkws_config.responsive_design_width;
@@ -162,6 +173,10 @@ if (mkws_config == null || typeof mkws_config != 'object') {
     };
 
 
+    // The following functions are dispatchers for team methods that
+    // are called from the UI using a team-name rather than implicit
+    // context. Apart from mkws.log, they are the ONLY public UI to
+    // this module.
     mkws.switchView = function(tname, view) {
 	mkws.teams[tname].switchView(view);
     }
@@ -273,12 +288,14 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 	    }
 	    var status = $(data).find("status");
 	    if (status.text() != "OK") {
-		alert("service proxy auth repsonse status: " + status.text() + ", give up!");
+		alert("service proxy auth response status: " + status.text() + ", give up!");
 		return;
 	    }
 
 	    log("Service proxy auth successfully done");
 	    mkws.authenticated = true;
+	    mkws.authName = $(data).find("displayName").text();
+	    log("authName='" + mkws.authName + "'");
 	    runAutoSearches();
 	});
     }
@@ -294,7 +311,6 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 
 
     $(document).ready(function() {
-	log("on load ready");
 	defaultMkwsConfig();
 
 	if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
@@ -316,9 +332,9 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 	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(function(e) { mkws.resizePage() });
+	    $(window).resize(resizePage);
 	    // initial check after page load
-	    $(document).ready(function() { mkws.resizePage() });
+	    $(document).ready(resizePage);
 	}
 
 	// protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
@@ -354,7 +370,7 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 	// the mkwsTeam_* class. Make all team objects.
 	var then = $.now();
 	$('[class^="mkws"],[class*=" mkws"]').each(function () {
-	    mkws.handleNodeWithTeam(this, function(tname, type) {
+	    handleNodeWithTeam(this, function(tname, type) {
 		if (!mkws.teams[tname]) {
 		    mkws.teams[tname] = team(j, tname);
 		    log("Made MKWS team '" + tname + "'");
@@ -366,7 +382,7 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 	// that sometimes makes new widget nodes (e.g. creating
 	// mkwsTermlists inside mkwsResults.
 	$('[class^="mkws"],[class*=" mkws"]').each(function () {
-	    mkws.handleNodeWithTeam(this, function(tname, type) {
+	    handleNodeWithTeam(this, function(tname, type) {
 		var myTeam = mkws.teams[tname];
 		var myWidget = widget(j, myTeam, type, this);
 	    });