Auto-search uses perpage configuration item.

[mkws-moved-to-github.git] / src / mkws-widgets.js

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 3ffb150..da20ce5 100644 (file)
--- 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
     };
 
@@ -266,15 +266,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 +285,19 @@ 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 s = "running auto search: '" + query + "'";
+           if (sortOrder) s += " sorted by '" + sortOrder + "'";
+           if (perpage) s += " with " + perpage + " per page";
+           if (targets) s += " in targets '" + targets + "'";
+           that.log(s);
+
+           that.team.newSearch(query, sortOrder, perpage, targets);
+       });
+    }
 });