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

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 327519a..719e3e0 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -658,6 +658,9 @@ mkws.info("Using window.name '" + window.name + "'");
     } else if (!mkws.authenticating) {
       // raw pp2 or we have a session already open
       runAutoSearches();
+      for (var teamName in mkws.teams) {
+        mkws.teams[teamName].queue("authenticated").publish();
+      }
     }
     
     mkws.isActive = true;

diff --git a/src/mkws-team.js b/src/mkws-team.js
index e4645b2..3d40f23 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -306,7 +306,6 @@ mkws.makeTeam = function($, teamName) {
 
   function triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
     resetPage();
-    queue("navi").publish();
 
     // Continue to use previous query/sort-order unless new ones are specified
     if (query) m_query = query;
@@ -334,6 +333,7 @@ mkws.makeTeam = function($, teamName) {
         "pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
     m_paz.search(m_query, m_perpage, m_sortOrder, pp2filter, undefined, params);
+    queue("searchtriggered").publish();
   }
 
   // fetch record details to be retrieved from the record queue

diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js
index 463172d..4a1d23b 100644 (file)
--- a/src/mkws-widget-main.js
+++ b/src/mkws-widget-main.js
@@ -141,7 +141,7 @@ mkws.registerWidgetType('navi', function() {
   var that = this;
   var teamName = this.team.name();
 
-  this.team.queue("navi").subscribe(function() {
+  this.team.queue("searchtriggered").subscribe(function() {
     var filters = that.team.filters();
     var output = {filters:[]};