Part of ACREP-80: new 'widget' parameter to team.newSearch

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

diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index 0ea1e0f..cb5708a 100644 (file)
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -104,17 +104,9 @@ mkws.makeWidget = function($, team, type, node) {
     var that = this;
     var query = this.config.autosearch;
     if (query) {
-      var old = this.team.config.query;
-      if (!old) {
-        // Stash this for subsequent inspection
-        this.team.config.query = query;
-      } else if (old === query) {
-        this.warn("duplicate autosearch: '" + query + "': ignoring");
-        return;
-      } else {
-        this.warn("conflicting autosearch: '" + query + "' vs '" + old + "': ignoring");
-        return;
-      }
+      // Should do this more elegantly with message passing
+      var widget = this.team.widget('query');
+      if (widget) { widget.node.val(query); }
 
       this.team.queue("ready").subscribe(function() {
         // Postpone testing for the configuration items: these are not
@@ -139,7 +131,7 @@ mkws.makeWidget = function($, team, type, node) {
         if (targetfilter) s += " constrained by targetfilter '" + targetfilter + "'";
         that.info(s);
 
-        that.team.newSearch(query, sortOrder, maxrecs, perpage, limit, targets, targetfilter);
+        that.team.newSearch(that, query, sortOrder, maxrecs, perpage, limit, targets, targetfilter);
       });
     }
   };