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

diff --git a/mkdru.client.js b/mkdru.client.js
index a672f21..352cae0 100644
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -18,7 +18,8 @@ var mkdru = {
     perpage: 20,
     sort: 'relevance',
     filter: null,
-    query:null
+    query:null,
+    recid:null
   },
   state: {}
 };
@@ -34,7 +35,9 @@ if (!$.isArray) $.isArray = function(obj) {
 
 // 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();
 };
@@ -56,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) {
@@ -164,14 +172,13 @@ mkdru.uiFromState = function () {
 };
 
 mkdru.hashChange = function () {
-  var hash = $.deparam.fragment();
+  mkdru.stateFromHash();
   // Request for details
-  if (typeof(hash.recid) !== "undefined") {
-    mkdru.pz2.record(hash.recid);
+  if (mkdru.state.recid) {
+    mkdru.pz2.record(mkdru.state.recid);
   }
   // Other internal link
   else {
-    mkdru.stateFromObject($.deparam.fragment());
     mkdru.pz2.showPage(mkdru.state.page-1);
     $('.mkdru-detail').hide();
     $('.mkdru-results').show();
@@ -180,37 +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.hashFromState();
-  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 + '"';
@@ -225,13 +236,18 @@ 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.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;
@@ -264,11 +280,6 @@ mkdru.resetPage = function () {
   mkdru.totalRec = 0;
 };
 
-mkdru.showPage = function (pageNum) {
-  mkdru.state.page = pageNum;
-  mkdru.pz2.showPage(pageNum-1);
-};
-
 
 
 // wait until the DOM is ready, bind events
@@ -277,8 +288,8 @@ $(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
@@ -305,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();
   }
 });