Minor cleanup.

[mkdru-moved-to-drupal.org.git] / mkdru.client.js

diff --git a/mkdru.client.js b/mkdru.client.js
index daa95b0..0561a7e 100644 (file)
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -6,9 +6,7 @@ var mkdru = {
   pz2: null,
   totalRec: 0,
   pagerRange: 6,
-  pazpar2Path: Drupal.settings.mkdru.pz2_path,
-  facetContainerSelector: Drupal.settings.mkdru.facetContainerSelector,
-  // State; Keys limit_{facet key} will also be initialised
+  facetContainerSelector: '#mkdru-raw-facet-container',
   defaultState: {
     page: 1,
     perpage: 20,
@@ -200,6 +198,8 @@ mkdru.hashChange = function () {
     mkdru.hashFromState();
     return;
   }
+  // return to top of page
+  window.scrollTo(0,0);
   // do we need to restart the search?
   var searchTrigger = false;
   // shallow copy of state so we can see what changed.
@@ -381,12 +381,12 @@ $(document).ready(function () {
 
   mkdru.pz2 = new pz2( { "onshow": mkdru.pz2Show,
               "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
-              "pazpar2path": mkdru.pazpar2Path,
+              "pazpar2path": mkdru.settings.pz2_path,
               "oninit": mkdru.pz2Init,
               "onstat": mkdru.pz2Status,
               "onterm": mkdru.pz2Term,
               "termlist": termlist.join(','),
-              "usesessions" : mkdru.settings.useSessions,
+              "usesessions" : mkdru.settings.use_sessions,
               "showResponseType": mkdru.showResponseType,
               "onrecord": mkdru.pz2Record,
               "autoInit": false } );
@@ -409,8 +409,8 @@ $(document).ready(function () {
     mkdru.pz2.init();
   } else {
     //runnin against SP
-    var user = Drupal.settings.mkdru.sp_user;
-    var pass = Drupal.settings.mkdru.sp_pass;
+    var user = mkdru.settings.sp.user;
+    var pass = mkdru.settings.sp.pass;
     var params = {};
     params['command'] = 'auth';
     if (user && pass) {
@@ -420,7 +420,7 @@ $(document).ready(function () {
     } else {
       params['action'] = 'ipauth';
     }
-    var authReq = new pzHttpRequest(mkdru.pazpar2Path, 
+    var authReq = new pzHttpRequest(mkdru.settings.pz2_path, 
       function (err) {
         alert("Authentication against metasearch gateway failed: " +err);
       }