Remove mkws-widget-image.js from COMPONENTS>

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

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 1c37ab7..98a48bd 100644 (file)
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -60,43 +60,48 @@ function widget($, team, type, node) {
 
 
 // Utility function for use by all widgets that can invoke autosearch.
-widget.maybeAutosearch = 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.autosearch = function(widget) {
+    widget.team.queue("ready").subscribe(function() {
+       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 target = widget.config.target;
+           if (target) targetfilter = 'udb=="' + target + '"';
+
            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, perpage, limit, targets, targetfilter);
-       });
-    }
+           widget.team.newSearch(query, sortOrder, maxrecs, perpage, limit, targets, targetfilter);
+       }
+    });
 };
 
 
@@ -212,7 +217,7 @@ mkws.registerWidgetType('Termlists', function() {
        }
     });
 
-    widget.maybeAutosearch(that);
+    widget.autosearch(that);
 });
 
 
@@ -301,14 +306,14 @@ mkws.registerWidgetType('Records', function() {
        $(that.node).html(html.join(''));
 
        function renderSummary(hit) {
-           var template = team.loadTemplate("Summary");
+           var template = team.loadTemplate(that.config.template || "Summary");
            hit._id = team.recordElementId(hit.recid[0]);
            hit._onclick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;"
            return template(hit);
        }
     });
 
-    widget.maybeAutosearch(that);
+    widget.autosearch(that);
 });