X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widget.js;h=3def9e36dd7263912d01bac52e50e99c86dacdf6;hb=404fc88a82967955076b37bd8f749789cc64363e;hp=8be006482852f6031de084ed2b7d5384b1a829f0;hpb=3236c3813f5da23cfb39605574399a6a2d856461;p=mkws-moved-to-github.git

diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index 8be0064..3def9e3 100644
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -107,33 +107,40 @@ function widget($, team, type, node) {
 
 // Utility function for use by all widgets that can invoke autosearch.
 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);
-        }
-      } else if (query.match(/^!var!/)) {
-        var name = query.replace(/^!var!/, '');
-        query = window[name]; // It's ridiculous that this works
-        widget.log("obtained query '" + query + "' from variable '" + name + "'");
-        if (!query) {
-          alert("This page has a MasterKey widget that needs a query specified by the '" + name + "' variable");
-        }
+  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);
+      }
+    } else if (query.match(/^!var!/)) {
+      var name = query.replace(/^!var!/, '');
+      query = window[name]; // It's ridiculous that this works
+      widget.log("obtained query '" + query + "' from variable '" + name + "'");
+      if (!query) {
+        alert("This page has a MasterKey widget that needs a query specified by the '" + name + "' variable");
       }
+    }
+
+    // Stash this for subsequent inspection
+    widget.team.config().query = query;
 
+    widget.team.queue("ready").subscribe(function() {
+      // Postpone testing for the configuration items: these are not
+      // yet set for Record subclass widgets that fill them in in the
+      // subclass, as widget.autosearch is called in the superclass,
+      // before the subclass fiddles with the configuration.
       var sortOrder = widget.config.sort;
       var maxrecs = widget.config.maxrecs;
       var perpage = widget.config.perpage;
@@ -153,8 +160,8 @@ widget.autosearch = function(widget) {
       widget.log(s);
 
       widget.team.newSearch(query, sortOrder, maxrecs, perpage, limit, targets, targetfilter);
-    }
-  });
+    });
+  }
 };