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

diff --git a/mkdru.client.js b/mkdru.client.js
index 69909e1..352cae0 100644
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -2,52 +2,69 @@
 var mkdru = {
   // Settings to pass to pz2.js
   usesessions: Drupal.settings.mkdru.use_sessions === '1',
-  showResponseType: 'json',
+  //   showResponseType: 'json',
   // Variables
-  curPage: 1,
-  recPerPage: 20,
-  totalRec: 0,
-  curSort: 'relevance',
-  curFilter: null,
   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,
-  pz2: null,
-  pazpar2Path: Drupal.settings.mkdru.pz2_path
+  pazpar2Path: Drupal.settings.mkdru.pz2_path,
+  // State
+  defaultState: {
+    page: 1,
+    perpage: 20,
+    sort: 'relevance',
+    filter: null,
+    query:null,
+    recid:null
+  },
+  state: {}
 };
 
 
 
+// So we can use jQuery BBQ with Drupal 6 and its 1.2.6 jQuery
+if (!$.isArray) $.isArray = function(obj) {
+  return Object.prototype.toString.call(obj) === "[object Array]";
+},
+
+
+
 // pz2.js event handlers:
 mkdru.pz2Init = function () {
-  if (mkdru.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.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-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.recPerPage * 
-                         (mkdru.curPage - 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();
+  if (mkdru.state.recid) {
+    mkdru.pz2.record(mkdru.state.recid);
+  }
+  else {
+    $('.mkdru-results').show();
+  }
 };
 
 mkdru.pz2Status = function (data) {
@@ -96,45 +113,115 @@ mkdru.pz2ByTarget = function (data) {
 };
 
 mkdru.pz2Record = function (data) {
-  clearTimeout(mkdru.pz2.recordTimer);
-//   $('.mkdru-results').hide();
-//   mkdru.pz2.stop();
-//   clearTimeout(mkdru.pz2.showTimer);  
+  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);
+};
+
+
+
+// State and URL handling 
 
+// populate state from an object and fill in the blanks with defaults
+mkdru.stateFromObject = function (obj) {
+  for (var key in mkdru.defaultState) {
+    if (typeof(obj[key]) != "undefined") {
+      mkdru.state[key] = obj[key];
+    }
+    else {
+      mkdru.state[key] = mkdru.defaultState[key];
+    }
+  }
+};
+
+// populate state from current window's hash string
+mkdru.stateFromHash = function () {
+  mkdru.stateFromObject($.deparam.fragment());
+};
+
+// 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]) {
+      alteredState[key] = mkdru.state[key];
+    }
+  }
+  $.bbq.pushState(alteredState);
+};
+
+// update mkdru_form theme's ui to match state
+mkdru.uiFromState = function () {
+  for (var key in mkdru.state) {
+    switch(key) {
+    case 'query':
+      $('.mkdru-search input:text').attr('value', mkdru.state[key]);
+      break;
+    case 'perpage':
+      $('.mkdru-perpage').attr('value', mkdru.state[key]);
+      break;
+    case 'sort':
+      $('.mkdru-sort').attr('value', mkdru.state[key]);
+      break;
+    }
+  }
 };
 
-// UI functions:
+mkdru.hashChange = function () {
+  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();
+  }
+};
+
+
+
+//search bo handler ONLY
 mkdru.submitQuery = function () {
-  mkdru.query = $('.mkdru-search input:text').attr('value');
-  mkdru.resetPage();
+  mkdru.state.query = $('.mkdru-search input:text').attr('value');
   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.query, mkdru.recPerPage, mkdru.curSort,
-      mkdru.curFilter);
+  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.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.state.perpage = $('.mkdru-perpage').attr('value');
+  mkdru.state.sort = $('.mkdru-sort').attr('value');
 };
 
+//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 + '"';
@@ -148,48 +235,62 @@ mkdru.limitTarget = function (id, name) {
         'Source: <a class="crossout" href="#" onclick="delimitTarget();return false;">'
         + name + '</a>';
   navi.innerHTML += '<hr/>';
-  mkdru.curFilter = 'pz:id=' + id;
-  mkdru.resetPage();
+  mkdru.state.filter = 'pz:id=' + id;
   mkdru.pollDropDowns();
+  mkdru.resetPage();
+  mkdru.hashFromState();
   mkdru.search();
   return false;
 };
 
-mkdru.resetPage = function () {
-  mkdru.curPage = 1;
-  mkdru.totalRec = 0;
-};
-
-mkdru.showPage = function (pageNum) {
-  mkdru.curPage = 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 = [];
 
-mkdru.requestDetail = function (e) {
-  mkdru.pz2.record(e.target.parentNode.id.replace('rec_', ''));
-};
+  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.recPerPage * mkdru.curPage > 0) {
-    mkdru.pz2.showNext();
-    mkdru.curPage++;
+  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.curPage--;
-  }
+mkdru.resetPage = function () {
+  mkdru.state.page = 1;
+  mkdru.totalRec = 0;
 };
 
 
+
 // wait until the DOM is ready, bind events
 // and instantiate pz2 library
 $(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);
+
   mkdru.pz2 = new pz2( { "onshow": mkdru.pz2Show,
               "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
               "pazpar2path": mkdru.pazpar2path,
@@ -202,10 +303,24 @@ $(document).ready(function () {
               "showResponseType": mkdru.showResponseType,
               "onrecord": mkdru.pz2Record,
               "autoInit": false } );
-  mkdru.query = Drupal.settings.mkdru.query;
+
+  // initialise state to hash string or defaults
+  mkdru.stateFromHash();
+  // and update UI to match
+  mkdru.uiFromState();
+
+  // ting thing
+  if (typeof(Drupal.settings.mkdru.query) !== "undefined") {
+    mkdru.state.query = Drupal.settings.mkdru.query
+  }
+
   if (mkdru.usesessions) {
     mkdru.pz2.init();
-  } else if (mkdru.query) {
-    mkdru.triggerSearch(); 
+  }
+  else if (mkdru.state.recid) {
+    mkdru.pz2.record(mkdru.state.recid);
+  }
+  else if (mkdru.state.query) {
+    mkdru.search();
   }
 });