Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 22e16d0..857df2b 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -35,7 +35,7 @@
     <div class="mkwsProgress"></div>
     <div class="mkwsSearch"></div>
     <div class="mkwsRecords" autosearch="dinosaur"></div>
-    <div class="mkwsTermlists" autosearch="dinosaur"></div>
+    <div class="mkwsTermlists" autosearch="water"></div>
     <div class="mkwsTargets"></div>
     <div class="mkwsStat"></div>
     <div class="mkwsBuilder"></div>

diff --git a/src/mkws-widget.js b/src/mkws-widget.js
index 33c977f..0c41a31 100644 (file)
--- a/src/mkws-widget.js
+++ b/src/mkws-widget.js
@@ -95,8 +95,17 @@ function widget($, team, type, node) {
         }
       }
 
-      // Stash this for subsequent inspection
-      this.team.config().query = 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;
+      }
 
       this.team.queue("ready").subscribe(function() {
         // Postpone testing for the configuration items: these are not