X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=893951cbacc001adb4066f1dd9da5800a6015a6e;hb=86f25a52eba4a79b06c614fee9279ea583b1d549;hp=7a260f237a79e077dd81ae72315a2f03ff31eb16;hpb=c2b2c85103cd0ff40d8c121af9abdc7da2cb28ec;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 7a260f2..893951c 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -102,20 +102,112 @@ mkws.log = function(string) {
 };
 
 
+mkws.objectWithParent = function(parent) {
+    function thing() {} // Must be function so `prototype' works
 
-// wrapper to call team() after page load
-(function(j) {
-    var log = mkws.log;
+    thing.prototype = parent;
+    var res = new thing();
+    thing.prototype = null;
+    return res;
+};
 
-    mkws.registerWidgetType = function(name, fn) {
-	mkws.widgetType2function[name] = fn;
-	log("registered widget-type '" + name + "'");
-    };
 
-    mkws.promotionFunction = function(name) {
-	return mkws.widgetType2function[name];
+mkws.registerWidgetType = function(name, fn) {
+    mkws.widgetType2function[name] = fn;
+    mkws.log("registered widget-type '" + name + "'");
+};
+
+mkws.promotionFunction = function(name) {
+    return mkws.widgetType2function[name];
+};
+
+
+mkws.defaultMkwsConfig = function() {
+    /* default mkws config */
+    var config_default = {
+	use_service_proxy: true,
+	pazpar2_url: "//mkws.indexdata.com/service-proxy/",
+	service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth",
+	lang: "",
+	sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
+	perpage_options: [10, 20, 30, 50],
+	sort_default: "relevance",
+	perpage_default: 20,
+	query_width: 50,
+	show_lang: true, 	/* show/hide language menu */
+	show_sort: true, 	/* show/hide sort menu */
+	show_perpage: true, 	/* show/hide perpage 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 */
+	log_level: 1,     /* log level for development: 0..2 */
+
+	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;
+    }
+
+    /* 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]);
+    }
+};
+
+
+// The following functions are dispatchers for team methods that
+// are called from the UI using a team-name rather than implicit
+// context.
+mkws.switchView = function(tname, view) {
+    mkws.teams[tname].switchView(view);
+};
+
+mkws.showDetails = function(tname, prefixRecId) {
+    mkws.teams[tname].showDetails(prefixRecId);
+};
+
+mkws.limitTarget  = function(tname, id, name) {
+    mkws.teams[tname].limitTarget(id, name);
+};
+
+mkws.limitQuery  = function(tname, field, value) {
+    mkws.teams[tname].limitQuery(field, value);
+};
+
+mkws.delimitTarget = function(tname, id) {
+    mkws.teams[tname].delimitTarget(id);
+};
+
+mkws.delimitQuery = function(tname, field, value) {
+    mkws.teams[tname].delimitQuery(field, value);
+};
+
+mkws.showPage = function(tname, pageNum) {
+    mkws.teams[tname].showPage(pageNum);
+};
+
+mkws.pagerPrev = function(tname) {
+    mkws.teams[tname].pagerPrev();
+};
+
+mkws.pagerNext = function(tname) {
+    mkws.teams[tname].pagerNext();
+};
+
+
+// wrapper to call team() after page load
+(function(j) {
+    var log = mkws.log;
 
     function handleNodeWithTeam(node, callback) {
 	// First branch for DOM objects; second branch for jQuery objects
@@ -125,7 +217,7 @@ mkws.log = function(string) {
 	    // undefined, we don't get an error message, but this
 	    // function and its callers, up several stack level,
 	    // silently return. What a crock.
-	    mkws.log("handleNodeWithTeam() called on node with no classes");
+	    log("handleNodeWithTeam() called on node with no classes");
 	    return;
 	}
  	var list = classes.split(/\s+/)
@@ -175,96 +267,6 @@ mkws.log = function(string) {
     };
 
 
-    // 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);
-    };
-
-    mkws.showDetails = function(tname, prefixRecId) {
-	mkws.teams[tname].showDetails(prefixRecId);
-    };
-
-    mkws.limitTarget  = function(tname, id, name) {
-	mkws.teams[tname].limitTarget(id, name);
-    };
-
-    mkws.limitQuery  = function(tname, field, value) {
-	mkws.teams[tname].limitQuery(field, value);
-    };
-
-    mkws.delimitTarget = function(tname, id) {
-	mkws.teams[tname].delimitTarget(id);
-    };
-
-    mkws.delimitQuery = function(tname, field, value) {
-	mkws.teams[tname].delimitQuery(field, value);
-    };
-
-    mkws.showPage = function(tname, pageNum) {
-	mkws.teams[tname].showPage(pageNum);
-    };
-
-    mkws.pagerPrev = function(tname) {
-	mkws.teams[tname].pagerPrev();
-    };
-
-    mkws.pagerNext = function(tname) {
-	mkws.teams[tname].pagerNext();
-    };
-
-
-    function defaultMkwsConfig() {
-	/* default mkws config */
-	var config_default = {
-	    use_service_proxy: true,
-	    pazpar2_url: "//mkws.indexdata.com/service-proxy/",
-	    service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth",
-	    lang: "",
-	    sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
-	    perpage_options: [10, 20, 30, 50],
-	    sort_default: "relevance",
-	    perpage_default: 20,
-	    query_width: 50,
-	    show_lang: true, 	/* show/hide language menu */
-	    show_sort: true, 	/* show/hide sort menu */
-	    show_perpage: true, 	/* show/hide perpage 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 */
-	    log_level: 1,     /* log level for development: 0..2 */
-
-	    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;
-	}
-
-	// make sure the mkws_config is a valid hash
-	if (!$.isPlainObject(mkws_config)) {
-	    log("ERROR: mkws_config is not an JS object, ignore it....");
-	    mkws_config = {};
-	}
-
-	/* 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]);
-	}
-    }
-
-
     /*
      * Run service-proxy authentication in background (after page load).
      * The username/password is configured in the apache config file
@@ -316,12 +318,7 @@ mkws.log = function(string) {
 
 
     $(document).ready(function() {
-	defaultMkwsConfig();
-
-	if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
-	    log("Reset query width: " + mkws_config.query_width);
-	    mkws_config.query_width = 50;
-	}
+	mkws.defaultMkwsConfig();
 
 	for (var key in mkws_config) {
 	    if (mkws_config.hasOwnProperty(key)) {
@@ -334,12 +331,9 @@ mkws.log = function(string) {
 	    }
 	}
 
-	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);
-	    // initial check after page load
-	    $(document).ready(resizePage);
+	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"
@@ -348,6 +342,14 @@ mkws.log = function(string) {
 	    log("adjust protocol independent links: " + mkws_config.pazpar2_url);
 	}
 
+	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);
+	    // initial check after page load
+	    $(document).ready(resizePage);
+	}
+
 	// Backwards compatibility: set new magic class names on any
 	// elements that have the old magic IDs.
 	var ids = [ "Switch", "Lang", "Search", "Pager", "Navi",