X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.client.js;h=95c9bf5c44e6c1fbb9e7dd111047d5051d847f7f;hb=92f23f8e3751e247fea54584fb84fb9266bb4ec9;hp=5b0ce75ee8a90d84a80a158877df87935fe148ee;hpb=83e16a5c12f1de16a989efb2a8c4db43ac71f9ef;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.client.js b/mkdru.client.js
index 5b0ce75..95c9bf5 100644
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -21,8 +21,9 @@ var mkdru = {
 
 // pz2.js event handlers:
 mkdru.pz2Init = function () {
-  mkdru.pz2.stat();
-  mkdru.pz2.bytarget();
+  if (mkdru.query) mkdru.triggerSearch();
+  //mkdru.pz2.stat();
+  //mkdru.pz2.bytarget();
 };
 
 mkdru.pz2Show = function (data) {
@@ -97,6 +98,7 @@ mkdru.pz2ByTarget = function (data) {
 
 // UI functions:
 mkdru.submitQuery = function () {
+  mkdru.query = $('.mkdru-search input:text').attr('value');
   mkdru.resetPage();
   mkdru.pollDropDowns();
   mkdru.search();
@@ -104,9 +106,14 @@ mkdru.submitQuery = function () {
   return false;
 };
 
+mkdru.triggerSearch = function () {
+  mkdru.search();
+  mkdru.submitted = true;
+};
+
 mkdru.search = function () {
-  mkdru.pz2.search($('.mkdru-search input:text').attr('value'),
-                   mkdru.recPerPage, mkdru.curSort, mkdru.curFilter);
+  mkdru.pz2.search(mkdru.query, mkdru.recPerPage, mkdru.curSort,
+      mkdru.curFilter);
 };
 
 mkdru.pollDropDowns = function () {
@@ -179,5 +186,12 @@ $(document).ready(function () {
               "onbytarget": mkdru.pz2ByTarget,
               "usesessions" : mkdru.usesessions,
               "showResponseType": mkdru.showResponseType,
-              "onrecord": mkdru.pz2Record } );
-});
\ No newline at end of file
+              "onrecord": mkdru.pz2Record,
+              "autoInit": false } );
+  mkdru.query = Drupal.settings.mkdru.query;
+  if (mkdru.usesessions) {
+    mkdru.pz2.init();
+  } else if (mkdru.query) {
+    mkdru.triggerSearch(); 
+  }
+});