Move the maybeAutosearch widget from the mkws namespace into the widget namespace.

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

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 1e01385..7f218be 100644 (file)
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -59,6 +59,47 @@ 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.team.queue("ready").subscribe(function() {
+           var sortOrder = widget.config.sort;
+           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 (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);
+       });
+    }
+};
+
+
 // Functions follow for promoting the regular widget object into
 // widgets of specific types. These could be moved into their own
 // source files.
@@ -265,43 +306,7 @@ mkws.registerWidgetType('Records', function() {
        }
     });
 
-    var query = that.config.autosearch;
-    if (query) {
-       if (query.match(/^!param!/)) {
-           var param = query.replace(/^!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");
-           }
-       } 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);
-           }
-       }
-
-       this.team.queue("ready").subscribe(function() {
-           var sortOrder = that.config.sort;
-           var perpage = that.config.perpage;
-           var limit = that.config.limit;
-           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 (limit) s += " limited by '" + limit + "'";
-           if (targets) s += " in targets '" + targets + "'";
-           if (torusquery) s += " constrained by torusquery '" + torusquery + "'";
-           that.log(s);
-
-           that.team.newSearch(query, sortOrder, perpage, limit, targets, torusquery);
-       });
-    }
+    widget.maybeAutosearch(that);
 });