Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkdru

diff --git a/mkdru.client.js b/mkdru.client.js
index b0d8b7f..dae3fa7 100644 (file)
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -30,7 +30,7 @@ var mkdru = {
     perpage: 20,
     sort: 'relevance',
     filter: null,
-    query:null,
+    query:'',
     recid:null
   },
   state: {},
@@ -131,8 +131,8 @@ mkdru.pz2ByTarget = function (data) {
 mkdru.pz2Record = function (data) {
   clearTimeout(mkdru.pz2.showTimer);
   $('.mkdru-results').hide();
-  $('.mkdru-detail').html(Drupal.theme('mkdruDetail', data));
-  $('.mkdru-detail-back').bind('click', function () {$.bbq.removeState('recid');});
+  $('.mkdru-detail').html(Drupal.theme('mkdruDetail', data,
+                                       mkdru.hashAddDelOne(null, null, 'recid')));
   $('.mkdru-detail').show();
   clearTimeout(mkdru.pz2.recordTimer);
 };
@@ -191,7 +191,7 @@ mkdru.hashChange = function () {
   }
   // Other internal link
   else {
-    // need to run search again to limit targets
+    // may need to run search again to limit targets
     for (key in mkdru.state) {
       if (key.substring(0,5) === 'limit') {
         mkdru.search();

diff --git a/mkdru.theme.js b/mkdru.theme.js
index 7d92e61..875d0f3 100644 (file)
--- a/mkdru.theme.js
+++ b/mkdru.theme.js
@@ -17,7 +17,7 @@ Drupal.theme.prototype.mkdruResult = function(hit, num, detailLink) {
   return html;
 };
 
-Drupal.theme.prototype.mkdruDetail = function(data) {
+Drupal.theme.prototype.mkdruDetail = function(data, linkBack) {
   var html = '<table id="det_' + data.recid +'">';
   if (data["md-title"] != undefined) {
     html += '<tr><th>' + Drupal.t("Title") + '</th><td><strong>:</strong> '
@@ -48,7 +48,7 @@ Drupal.theme.prototype.mkdruDetail = function(data) {
             + data["location"][0]["@name"] + " (" + data["location"][0]["@id"] + ")"
             + '</td></tr>';
   html += '</table></div>';
-  html += '<a class="mkdru-detail-back">Return to result list...</a>';
+  html += '<a href="' + linkBack + '">Return to result list...</a>';
   return html;
 };