From: Mike Taylor <mike@indexdata.com>
Date: Wed, 28 May 2014 14:33:09 +0000 (+0100)
Subject: The autosearch function is now a member of the widget object, so it's
X-Git-Tag: 1.0.0~585
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=f6ba9fb4f750b6e3ddeabe4bba961c3f011a7d86;p=mkws-moved-to-github.git

The autosearch function is now a member of the widget object, so it's
invoked as
	w.autosearch()
rather than
	widget.autosearch(w)
---

diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index 3def9e3..f6c2e2e 100644
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -66,6 +66,67 @@ function widget($, team, type, node) {
     return s.join('');
   };
 
+  // Utility function for use by all widgets that can invoke autosearch.
+  that.autosearch = function() {
+    var widget = this;
+    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;
+        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, maxrecs, perpage, limit, targets, targetfilter);
+      });
+    }
+  };
+
+
   for (var i = 0; i < node.attributes.length; i++) {
     var a = node.attributes[i];
     if (a.name === 'data-mkws-config') {
@@ -105,66 +166,6 @@ function widget($, team, type, node) {
 }
 
 
-// Utility function for use by all widgets that can invoke autosearch.
-widget.autosearch = 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);
-      }
-    } 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;
-      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, maxrecs, perpage, limit, targets, targetfilter);
-    });
-  }
-};
-
-
 // Utility function for all widgets that want to hide in narrow windows
 widget.hideWhenNarrow = function(widget) {
   widget.team.queue("resize-narrow").subscribe(function(n) {