X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.client.js;h=352cae0523866ac91698d26f7708e336a87055e3;hb=f56694d19c033aa03d48a264705a7481e188957b;hp=b8e7f4c8d09de779125d1fcc143d35cdfb797482;hpb=8c8f2a5d5896e6d5129ec249ef2d250170406dc6;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.client.js b/mkdru.client.js
index b8e7f4c..352cae0 100644
--- 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,
@@ -18,37 +19,35 @@ var mkdru = {
     sort: 'relevance',
     filter: null,
     query:null,
+    recid: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]";
 },
 
 
 
 // pz2.js event handlers:
 mkdru.pz2Init = function () {
-  if (mkdru.state.query) mkdru.triggerSearch();
+  if (mkdru.state.query) {
+    mkdru.search();
+  }
   //mkdru.pz2.stat();
   //mkdru.pz2.bytarget();
 };
 
 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 = "";
@@ -60,7 +59,12 @@ mkdru.pz2Show = function (data) {
     );
   }
   $('.mkdru-result-list').html(html);
-  $('.mkdru-results').show();
+  if (mkdru.state.recid) {
+    mkdru.pz2.record(mkdru.state.recid);
+  }
+  else {
+    $('.mkdru-results').show();
+  }
 };
 
 mkdru.pz2Status = function (data) {
@@ -125,7 +129,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 {
@@ -169,12 +172,14 @@ mkdru.uiFromState = function () {
 };
 
 mkdru.hashChange = function () {
-  dump("Submidded? " + mkdru.submitted + "\n");
-  var hash = $.deparam.fragment();
-  if (typeof(hash.recid) !== "undefined") {
-    mkdru.pz2.record(hash.recid);
+  mkdru.stateFromHash();
+  // Request for details
+  if (mkdru.state.recid) {
+    mkdru.pz2.record(mkdru.state.recid);
   }
+  // Other internal link
   else {
+    mkdru.pz2.showPage(mkdru.state.page-1);
     $('.mkdru-detail').hide();
     $('.mkdru-results').show();
   }
@@ -182,36 +187,41 @@ mkdru.hashChange = function () {
 
 
 
-// UI functions:
+//search bo handler ONLY
 mkdru.submitQuery = function () {
   mkdru.state.query = $('.mkdru-search input:text').attr('value');
-  mkdru.resetPage();
   mkdru.pollDropDowns();
+  mkdru.resetPage();
   mkdru.hashFromState();
   mkdru.search();
   mkdru.submitted = true;
   return false;
 };
 
-mkdru.triggerSearch = function () {
-  mkdru.search();
-  mkdru.submitted = true;
-};
+//criteria drop-downs (perpage,sort) handler ONLY
+mkdru.submitCriteria = function () {
+  mkdru.pollDropDowns();
+  //search is not ON, do nothing
+  if (!mkdru.submitted) return false;
+  mkdru.resetPage();
+  mkdru.hashFromState();
+  mkdru.pz2.show(0, mkdru.state.perpage, mkdru.state.sort);
+  return false;
+}
 
 mkdru.search = function () {
   mkdru.pz2.search(mkdru.state.query, mkdru.state.perpage, mkdru.state.sort,
       mkdru.state.filter);
+  //inform others that the search is ON
+  mkdru.submitted = true;
 };
 
 mkdru.pollDropDowns = function () {
   mkdru.state.perpage = $('.mkdru-perpage').attr('value');
   mkdru.state.sort = $('.mkdru-sort').attr('value');
-  if (!mkdru.submitted) return false;
-  mkdru.resetPage();
-  mkdru.pz2.show(0, mkdru.state.perpage, mkdru.state.sort);
-  return false;
 };
 
+//TODO it's rude to mess with user's query, we should have a breadcrumb
 mkdru.limitQuery = function (field, value) {
   $('.mkdru-search input:text').attr('value', function () {
     return this.value += ' and ' + field + '="' + value + '"';
@@ -226,35 +236,48 @@ mkdru.limitTarget = function (id, name) {
         + name + '</a>';
   navi.innerHTML += '<hr/>';
   mkdru.state.filter = 'pz:id=' + id;
-  mkdru.resetPage();
   mkdru.pollDropDowns();
+  mkdru.resetPage();
+  mkdru.hashFromState();
   mkdru.search();
   return false;
 };
 
-mkdru.resetPage = function () {
-  mkdru.state.page = 1;
-  mkdru.totalRec = 0;
-};
-
-mkdru.showPage = function (pageNum) {
-  mkdru.state.page = pageNum;
-  mkdru.pz2.showPage(pageNum-1);
-};
+mkdru.generatePager = function () {
+ // make sure page param is a number, otherwise pageing frwd will be broken
+  if (typeof mkdru.state.page == "string") {
+    mkdru.state.page = Number(mkdru.state.page);
+  }
+  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}))
+  }
 
-mkdru.nextPage = function () {
-  if (mkdru.totalRec - mkdru.state.perpage * mkdru.state.page > 0) {
-    mkdru.pz2.showNext();
-    mkdru.state.page++;
-    mkdru.hashFromState();
+  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.prevPage = function () {
-  if (mkdru.pz2.showPrev() != false) {
-    mkdru.state.page--;
-    mkdru.hashFromState();
-  }
+mkdru.resetPage = function () {
+  mkdru.state.page = 1;
+  mkdru.totalRec = 0;
 };
 
 
@@ -265,10 +288,9 @@ $(document).ready(function () {
   $(window).bind( 'hashchange', mkdru.hashChange);
   $('.mkdru-search').bind('submit', mkdru.submitQuery);
   $('.mkdru-search input:text').attr('value', '');
-  $('.mkdru-perpage').bind('change', function () { mkdru.pollDropDowns() });
-  $('.mkdru-sort').bind('change', function () { mkdru.pollDropDowns() });
+  $('.mkdru-perpage').bind('change', mkdru.submitCriteria);
+  $('.mkdru-sort').bind('change', mkdru.submitCriteria);
 
-  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,
@@ -286,8 +308,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
@@ -295,7 +316,11 @@ $(document).ready(function () {
 
   if (mkdru.usesessions) {
     mkdru.pz2.init();
-  } else if (mkdru.state.query) {
-    mkdru.triggerSearch(); 
+  }
+  else if (mkdru.state.recid) {
+    mkdru.pz2.record(mkdru.state.recid);
+  }
+  else if (mkdru.state.query) {
+    mkdru.search();
   }
 });