X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmkws-widget.js;h=d7ce3baee8f38067d0720140005d1a76ee6736d2;hb=12c37b03abe6bbe06c3e5c2b585d6662e3f1efd1;hp=33c977fe86ba6d141ecf74d868dc7deb0be90dc3;hpb=d239fb9425b458b7d8f7a72029e7677801dbbe3b;p=mkws-moved-to-github.git

diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index 33c977f..d7ce3ba 100644
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -66,38 +66,51 @@ function widget($, team, type, node) {
     return s.join('');
   };
 
+  that.expandValue = function(val) {
+    if (val.match(/^!param!/)) {
+      var param = val.replace(/^!param!/, '');
+      val = mkws.getParameterByName(param);
+      this.log("obtained val '" + val + "' from param '" + param + "'");
+      if (!val) {
+        alert("This page has a MasterKey widget that needs a val specified by the '" + param + "' parameter");
+      }
+    } else if (val.match(/^!path!/)) {
+      var index = val.replace(/^!path!/, '');
+      var path = window.location.pathname.split('/');
+      val = path[path.length - index];
+      this.log("obtained val '" + val + "' from path-component '" + index + "'");
+      if (!val) {
+        alert("This page has a MasterKey widget that needs a val specified by the path-component " + index);
+      }
+    } else if (val.match(/^!var!/)) {
+      var name = val.replace(/^!var!/, '');
+      val = window[name]; // It's ridiculous that this works
+      this.log("obtained val '" + val + "' from variable '" + name + "'");
+      if (!val) {
+        alert("This page has a MasterKey widget that needs a val specified by the '" + name + "' variable");
+      }
+    }
+    return val;
+  };
+
   // Utility function for use by all widgets that can invoke autosearch.
   that.autosearch = function() {
     var that = this;
     var query = this.config.autosearch;
     if (query) {
-      if (query.match(/^!param!/)) {
-        var param = query.replace(/^!param!/, '');
-        query = mkws.getParameterByName(param);
-        this.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];
-        this.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
-        this.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");
-        }
+      query = this.expandValue(query);
+      var old = this.team.config().query;
+      if (!old) {
+        // Stash this for subsequent inspection
+        this.team.config().query = query;
+      } else if (old === query) {
+        this.log("duplicate autosearch: '" + query + "': ignoring");
+        return;
+      } else {
+        this.log("conflicting autosearch: '" + query + "' vs '" + old + "': ignoring");
+        return;
       }
 
-      // Stash this for subsequent inspection
-      this.team.config().query = query;
-
       this.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