Pager rewrite for bookmark/history support.

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

diff --git a/mkdru.client.js b/mkdru.client.js
index 86fcf50..a672f21 100644 (file)
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -7,6 +7,7 @@ var mkdru = {
   submitted: false,
   pz2: null,
   totalRec: 0,
+  pagerRange: 6,
   sourceMax: Drupal.settings.mkdru.source_max,
   subjectMax: Drupal.settings.mkdru.subject_max,
   authorMax: Drupal.settings.mkdru.author_max,
@@ -17,16 +18,16 @@ var mkdru = {
     perpage: 20,
     sort: 'relevance',
     filter: null,
-    query:null,
+    query:null
   },
-  state: {},
+  state: {}
 };
 
 
 
 // So we can use jQuery BBQ with Drupal 6 and its 1.2.6 jQuery
-if (!$.isArray) $.isArray = function( obj ) {
-  return toString.call(obj) === "[object Array]";
+if (!$.isArray) $.isArray = function(obj) {
+  return Object.prototype.toString.call(obj) === "[object Array]";
 },
 
 
@@ -40,25 +41,21 @@ mkdru.pz2Init = function () {
 
 mkdru.pz2Show = function (data) {
   mkdru.totalRec = data.merged;
-
-  var pagerHtml = Drupal.theme('mkdruPager', data, mkdru.state.page,
-                                      Math.ceil(mkdru.totalRec / mkdru.state.perpage));
-  $('.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-pager').html(mkdru.generatePager());
+  var countsHtml = Drupal.t('Displaying: ') + (data.start + 1) + 
+    Drupal.t(' to ') + (data.start + data.num) + Drupal.t(' of ')
+    + data.merged + Drupal.t(' (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], 
-                         i + 1 + mkdru.state.perpage * 
-                         (mkdru.state.page - 1));
+      i + 1 + mkdru.state.perpage * (mkdru.state.page - 1),
+      "#" + $.param.fragment($.param.fragment(
+        window.location.href, {recid: data.hits[i].recid})) + "\n"
+    );
   }
   $('.mkdru-result-list').html(html);
-  $('.mkdru-result-title').bind('click', mkdru.requestDetail);
   $('.mkdru-results').show();
 };
 
@@ -111,7 +108,7 @@ mkdru.pz2Record = function (data) {
   clearTimeout(mkdru.pz2.showTimer);
   $('.mkdru-results').hide();
   $('.mkdru-detail').html(Drupal.theme('mkdruDetail', data));
-  $('.mkdru-detail').bind('click', function () {$('.mkdru-detail').hide()});
+  $('.mkdru-detail-back').bind('click', function () {$.bbq.removeState('recid');});
   $('.mkdru-detail').show();
   clearTimeout(mkdru.pz2.recordTimer);
 };
@@ -124,7 +121,6 @@ mkdru.pz2Record = function (data) {
 mkdru.stateFromObject = function (obj) {
   for (var key in mkdru.defaultState) {
     if (typeof(obj[key]) != "undefined") {
-      dump (key + " :: " + obj[key] + "\n");
       mkdru.state[key] = obj[key];
     }
     else {
@@ -140,6 +136,7 @@ mkdru.stateFromHash = function () {
 
 // set current window's hash string from state
 mkdru.hashFromState = function () {
+  // only include non-default settings in the URL
   var alteredState = {};
   for (var key in mkdru.defaultState) {
     if (mkdru.state[key] != mkdru.defaultState[key]) {
@@ -167,7 +164,18 @@ mkdru.uiFromState = function () {
 };
 
 mkdru.hashChange = function () {
-  dump("Submidded? " + mkdru.submitted + "\n");
+  var hash = $.deparam.fragment();
+  // Request for details
+  if (typeof(hash.recid) !== "undefined") {
+    mkdru.pz2.record(hash.recid);
+  }
+  // Other internal link
+  else {
+    mkdru.stateFromObject($.deparam.fragment());
+    mkdru.pz2.showPage(mkdru.state.page-1);
+    $('.mkdru-detail').hide();
+    $('.mkdru-results').show();
+  }
 };
 
 
@@ -189,7 +197,6 @@ mkdru.triggerSearch = function () {
 };
 
 mkdru.search = function () {
-  $('.mkdru-detail').hide();
   mkdru.pz2.search(mkdru.state.query, mkdru.state.perpage, mkdru.state.sort,
       mkdru.state.filter);
 };
@@ -199,6 +206,7 @@ mkdru.pollDropDowns = function () {
   mkdru.state.sort = $('.mkdru-sort').attr('value');
   if (!mkdru.submitted) return false;
   mkdru.resetPage();
+  mkdru.hashFromState();
   mkdru.pz2.show(0, mkdru.state.perpage, mkdru.state.sort);
   return false;
 };
@@ -223,6 +231,34 @@ mkdru.limitTarget = function (id, name) {
   return false;
 };
 
+mkdru.generatePager = function () {
+  var total = Math.ceil(mkdru.totalRec / mkdru.state.perpage);
+  var first = (mkdru.state.page - mkdru.pagerRange > 0)
+      ? mkdru.state.page - mkdru.pagerRange : 1;
+  var last = first + 2 * mkdru.pagerRange < total
+      ? first + 2 * mkdru.pagerRange : total;  
+  var prev = null;
+  var next = null;
+  var pages = [];
+
+  if ((mkdru.state.page - 1) >= first) {
+    prev = "#" + $.param.fragment($.param.fragment(
+               window.location.href, {page: mkdru.state.page - 1}))
+  }
+  if ((mkdru.state.page + 1) <= total) {
+    next = "#" + $.param.fragment($.param.fragment(
+               window.location.href, {page: mkdru.state.page + 1}))
+  }
+
+  for (var i = first; i <= last; i++) {
+    pages.push("#" + $.param.fragment($.param.fragment(
+               window.location.href, {page: i})));
+  }
+
+  return Drupal.theme('mkdruPager', pages, first, mkdru.state.page,
+                      total, prev, next);
+};
+
 mkdru.resetPage = function () {
   mkdru.state.page = 1;
   mkdru.totalRec = 0;
@@ -233,23 +269,6 @@ mkdru.showPage = function (pageNum) {
   mkdru.pz2.showPage(pageNum-1);
 };
 
-mkdru.requestDetail = function (e) {
-  mkdru.pz2.record(e.target.parentNode.id.replace('rec_', ''));
-};
-
-mkdru.nextPage = function () {
-  if (mkdru.totalRec - mkdru.state.perpage * mkdru.state.page > 0) {
-    mkdru.pz2.showNext();
-    mkdru.state.page++;
-  }
-};
-
-mkdru.prevPage = function () {
-  if (mkdru.pz2.showPrev() != false) {
-    mkdru.state.page--;
-  }
-};
-
 
 
 // wait until the DOM is ready, bind events
@@ -261,7 +280,6 @@ $(document).ready(function () {
   $('.mkdru-perpage').bind('change', function () { mkdru.pollDropDowns() });
   $('.mkdru-sort').bind('change', function () { mkdru.pollDropDowns() });
 
-  dump("NEW PZ2!\n");
   mkdru.pz2 = new pz2( { "onshow": mkdru.pz2Show,
               "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
               "pazpar2path": mkdru.pazpar2path,
@@ -279,8 +297,7 @@ $(document).ready(function () {
   mkdru.stateFromHash();
   // and update UI to match
   mkdru.uiFromState();
-  dump("QUERY:" + mkdru.state.query + "\n");
-  
+
   // ting thing
   if (typeof(Drupal.settings.mkdru.query) !== "undefined") {
     mkdru.state.query = Drupal.settings.mkdru.query