X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=0bfc174472329b0f097dc8040f87ae9daca12bed;hb=96ff13c77214b76cb54dbaa6b9fae081a856738f;hp=de050e02ef5711ea9ab5abc723a9498af31827c3;hpb=4e3ce33fda02425e9bb6218da13c25eac2555112;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index de050e0..0bfc174 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -96,16 +96,6 @@ 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) {
@@ -154,13 +144,25 @@ mkws.setMkwsConfig = function(overrides) {
 	dummy: "dummy"
     };
 
-    mkws.config = Object.create(config_default);
+    mkws.config = mkws.objectInheritingFrom(config_default);
     for (var k in overrides) {
 	mkws.config[k] = overrides[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();
+}
+
+
 // The following functions are dispatchers for team methods that
 // are called from the UI using a team-name rather than implicit
 // context.
@@ -180,6 +182,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);
 };
@@ -227,6 +233,8 @@ mkws.pagerNext = function(tname) {
 		type = cname.replace(/^mkws/, '');
 	    }
 	}
+
+        if (!teamName) teamName = "AUTO";
 	callback.call(node, teamName, type);
     }
 
@@ -295,8 +303,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,20 +323,32 @@ mkws.pagerNext = function(tname) {
     }
 
 
-    // I don't understand why I need this copy, but I do: mkws_config
-    // is not visible inside the document.ready function, but the
-    // saved copy is.
-    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;
+    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() {
+	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) {
@@ -373,15 +395,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();
@@ -393,19 +406,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]
+//            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,