From: Mike Taylor <mike@indexdata.com>
Date: Tue, 27 May 2014 15:45:19 +0000 (+0100)
Subject: Calculate query up front, not just on "ready" event.
X-Git-Tag: 1.0.0~596
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=082245055cc0cae23ee2ae08c5a5a8a32a1a1c89

Calculate query up front, not just on "ready" event.
---

diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index 8be0064..534e4b3 100644
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -107,33 +107,35 @@ 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");
+      }
+    }
+  }
 
+  widget.team.queue("ready").subscribe(function() {
+    if (query) {
       var sortOrder = widget.config.sort;
       var maxrecs = widget.config.maxrecs;
       var perpage = widget.config.perpage;