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

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 3ffb150..17ecdab 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
     };
 
@@ -257,8 +257,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,15 +265,11 @@ mkws.registerWidgetType('Records', function() {
 	}
     });
 
-    this.team.queue("ready").subscribe(function() {
-	var node = $(that.node);
-	var query = node.attr('autosearch');
-	if (!query)
-	    return;
-
+    var query = that.config.autosearch;
+    if (query) {
 	if (query.match(/^!param!/)) {
 	    var param = query.replace(/^!param!/, '');
-	    query = getParameterByName(param);
+	    query = mkws.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");
@@ -289,17 +284,22 @@ mkws.registerWidgetType('Records', function() {
 	    }
 	}
 
-	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);
-    });
+	this.team.queue("ready").subscribe(function() {
+	    var sortOrder = that.config.sort;
+	    var perpage = that.config.perpage;
+	    var targets = that.config.targets;
+	    var torusquery = that.config.torusquery;
+	    that.log("torusquery='" + torusquery + "'");
+	    var s = "running auto search: '" + query + "'";
+	    if (sortOrder) s += " sorted by '" + sortOrder + "'";
+	    if (perpage) s += " with " + perpage + " per page";
+	    if (targets) s += " in targets '" + targets + "'";
+	    if (torusquery) s += " limited by torusquery '" + torusquery + "'";
+	    that.log(s);
+
+	    that.team.newSearch(query, sortOrder, perpage, targets, torusquery);
+	});
+    }
 });