X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widgets.js;h=bb529bfecd06e3c663fb8d17451112345a4e8ae0;hb=7bf5eb4799d8f01f1a6038e9137eb0aa05d02d6c;hp=3ffb15071cda6eb3d8643cdf881591442e0e90a4;hpb=607d27f0724d46e06783c69c1d7b9f17a783670f;p=mkws-moved-to-github.git

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 3ffb150..bb529bf 100644
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -2,7 +2,7 @@
 function widget($, team, type, node) {
     // Static register of attributes that do not contribute to config
     var ignoreAttrs = {
-	id:1, class:1, style:1, name:1, action:1, type:1, size:1,
+	id:1, 'class':1, style:1, name:1, action:1, type:1, size:1,
 	value:1, width:1, valign:1
     };
 
@@ -59,6 +59,49 @@ function widget($, team, type, node) {
 }
 
 
+// Utility function for use by all widgets that can invoke autosearch.
+widget.autosearch = function(widget) {
+    var query = widget.config.autosearch;
+    if (query) {
+	if (query.match(/^!param!/)) {
+	    var param = query.replace(/^!param!/, '');
+	    query = mkws.getParameterByName(param);
+	    widget.log("obtained query '" + query + "' from param '" + param + "'");
+	    if (!query) {
+		alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter");
+	    }
+	} else if (query.match(/^!path!/)) {
+	    var index = query.replace(/^!path!/, '');
+	    var path = window.location.pathname.split('/');
+	    query = path[path.length - index];
+	    widget.log("obtained query '" + query + "' from path-component '" + index + "'");
+	    if (!query) {
+		alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
+	    }
+	}
+
+	widget.team.queue("ready").subscribe(function() {
+	    var sortOrder = widget.config.sort;
+	    var maxrecs = widget.config.maxrecs;
+	    var perpage = widget.config.perpage;
+	    var limit = widget.config.limit;
+	    var targets = widget.config.targets;
+	    var targetfilter = widget.config.targetfilter;
+	    var s = "running auto search: '" + query + "'";
+	    if (sortOrder) s += " sorted by '" + sortOrder + "'";
+	    if (maxrecs) s += " restricted to " + maxrecs + " records";
+	    if (perpage) s += " with " + perpage + " per page";
+	    if (limit) s += " limited by '" + limit + "'";
+	    if (targets) s += " in targets '" + targets + "'";
+	    if (targetfilter) s += " constrained by targetfilter '" + targetfilter + "'";
+	    widget.log(s);
+
+	    widget.team.newSearch(query, sortOrder, maxrecs, perpage, limit, targets, targetfilter);
+	});
+    }
+};
+
+
 // Functions follow for promoting the regular widget object into
 // widgets of specific types. These could be moved into their own
 // source files.
@@ -170,6 +213,8 @@ mkws.registerWidgetType('Termlists', function() {
 	    acc.push('</div>');
 	}
     });
+
+    widget.autosearch(that);
 });
 
 
@@ -257,8 +302,7 @@ mkws.registerWidgetType('Records', function() {
 	}
 	$(that.node).html(html.join(''));
 
-	function renderSummary(hit)
-	{
+	function renderSummary(hit) {
 	    var template = team.loadTemplate("Summary");
 	    hit._id = team.recordElementId(hit.recid[0]);
 	    hit._onclick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;"
@@ -266,40 +310,7 @@ mkws.registerWidgetType('Records', function() {
 	}
     });
 
-    this.team.queue("ready").subscribe(function() {
-	var node = $(that.node);
-	var query = node.attr('autosearch');
-	if (!query)
-	    return;
-
-	if (query.match(/^!param!/)) {
-	    var param = query.replace(/^!param!/, '');
-	    query = getParameterByName(param);
-	    that.log("obtained query '" + query + "' from param '" + param + "'");
-	    if (!query) {
-		alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter");
-	    }
-	} else if (query.match(/^!path!/)) {
-	    var index = query.replace(/^!path!/, '');
-	    var path = window.location.pathname.split('/');
-	    query = path[path.length - index];
-	    that.log("obtained query '" + query + "' from path-component '" + index + "'");
-	    if (!query) {
-		alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
-	    }
-	}
-
-	that.log("node=" + node + ", class='" + node.className + "', query=" + query);
-
-	var sortOrder = node.attr('sort');
-	var targets = node.attr('targets');
-	var s = "running auto search: '" + query + "'";
-	if (sortOrder) s += " sorted by '" + sortOrder + "'";
-	if (targets) s += " in targets '" + targets + "'";
-	that.log(s);
-
-	that.team.newSearch(query, sortOrder, targets);
-    });
+    widget.autosearch(that);
 });