Only authenticate if !mkws.authenticated

[mkws-moved-to-github.git] / src / mkws-core.js

diff --git a/src/mkws-core.js b/src/mkws-core.js
index b8b06b4..9c46f27 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -386,7 +386,7 @@ mkws.pagerNext = function(tname) {
       // autosearch on the team or the team has otherwise gotten a query
       if (node.hasAttribute("autosearch")) {
         if (mkws.autoHasAuto ||
-            mkws.teams["AUTO"] && mkws.teams["AUTO"].config()["query"]) {
+            mkws.teams["AUTO"] && mkws.teams["AUTO"].config["query"]) {
           log("AUTO team already has a query, using unique team");
           teamName = "UNIQUE";
         }
@@ -623,7 +623,7 @@ mkws.pagerNext = function(tname) {
       }
     */
 
-    if (mkws.config.use_service_proxy) {
+    if (mkws.config.use_service_proxy && !mkws.authenticated) {
       authenticateSession(mkws.config.service_proxy_auth,
                           mkws.config.service_proxy_auth_domain,
                           mkws.config.pazpar2_url);
@@ -632,8 +632,21 @@ mkws.pagerNext = function(tname) {
       runAutoSearches();
     }
   };
-  $(document).ready(function() {
+
+  // callback for calls after page load, e.g. requirejs
+  mkws.init_widgets = function (message) {
+    if (message) mkws.log(message);
+
     var widgetSelector = selectorForAllWidgets();
-    if (widgetSelector && $(widgetSelector).length !== 0) init();
+    if (widgetSelector && $(widgetSelector).length !== 0) {
+      init();
+    } else {
+       mkws.log("no widgets found");
+    }
+  };
+
+  $(document).ready(function() {
+    mkws.init_widgets();
   });
+
 })(mkws.$);