Fix dropdowns, start improving markup.

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

diff --git a/mkdru.client.js b/mkdru.client.js
index ae1ccca..6ee3163 100644 (file)
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -1,8 +1,8 @@
 // Set up namespace and some state.
 var mkdru = {
   // Settings to pass to pz2.js
-  usesessions: true,
-  showResponseType: '',
+  usesessions: Drupal.settings.mkdru.use_sessions === '1',
+  showResponseType: 'json',
   // Variables
   curPage: 1,
   recPerPage: 20,
@@ -10,11 +10,11 @@ var mkdru = {
   curSort: 'relevance',
   curFilter: null,
   submitted: false,
-  sourceMax: 16, // facets
-  subjectMax: 10,
-  authorMax: 10,
+  sourceMax: Drupal.settings.mkdru.source_max,
+  subjectMax: Drupal.settings.mkdru.subject_max,
+  authorMax: Drupal.settings.mkdru.author_max,
   pz2: null,
-  pazpar2Path: '/pazpar2/search.pz2',
+  pazpar2Path: Drupal.settings.mkdru.pz2_path
 };
 
 
@@ -27,11 +27,17 @@ mkdru.pz2Init = function () {
 
 mkdru.pz2Show = function (data) {
   mkdru.totalRec = data.merged;
-  $('#mkdru-pager').html(Drupal.theme('mkdruPager', data, mkdru.curPage,
-                                      Math.ceil(mkdru.totalRec / mkdru.recPerPage)));
+
+  var pagerHtml = Drupal.theme('mkdruPager', data, mkdru.curPage,
+                                      Math.ceil(mkdru.totalRec / mkdru.recPerPage));
+  $('.mkdru-pager').html(pagerHtml);
   $('.mkdru-next').bind('click', mkdru.nextPage);
   $('.mkdru-prev').bind('click', mkdru.prevPage);
 
+  var countsHtml = 'Displaying: ' + (data.start + 1) + ' to '
+    + (data.start + data.num) + ' of ' + data.merged + ' (found: ' + data.total + ')';
+  $('.mkdru-counts').html(countsHtml);
+
   var html = "";
   for (var i = 0; i < data.hits.length; i++) {
     html += Drupal.theme('mkdruResult', data.hits[i], 
@@ -90,10 +96,11 @@ mkdru.pz2ByTarget = function (data) {
 
 // UI functions:
 mkdru.submitQuery = function () {
-  mkdru.submitted = true;
-//   mkdru.resetPage();
-//   mkdru.pollDropDowns();
+  mkdru.resetPage();
+  mkdru.pollDropDowns();
   mkdru.search();
+  mkdru.submitted = true;
+  $('.mkdru-post-search').show();
   return false;
 };
 
@@ -103,11 +110,12 @@ mkdru.search = function () {
 };
 
 mkdru.pollDropDowns = function () {
-  mkdru.recPerPage = $('#mkdru-perpage').value;
-  mkdru.curSort = $('#mkdru-sort').value;
+  mkdru.recPerPage = $('#mkdru-perpage').attr('value');
+  mkdru.curSort = $('#mkdru-sort').attr('value');
   if (!mkdru.submitted) return false;
   mkdru.resetPage();
   mkdru.pz2.show(0, mkdru.recPerPage, mkdru.curSort);
+  return false;
 };
 
 mkdru.limitQuery = function (field, value) {