Remove redundant 'show' when query is submitted.

[mkdru-moved-to-drupal.org.git] / mkdru.client.js

diff --git a/mkdru.client.js b/mkdru.client.js
index 2881fda..fff8247 100644 (file)
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -214,7 +214,6 @@ mkdru.pollDropDowns = function () {
   if (!mkdru.submitted) return false;
   mkdru.resetPage();
   mkdru.hashFromState();
-  mkdru.pz2.show(0, mkdru.state.perpage, mkdru.state.sort);
   return false;
 };
 
@@ -239,6 +238,10 @@ mkdru.limitTarget = function (id, name) {
 };
 
 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;
@@ -279,8 +282,14 @@ $(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() });
+  $('.mkdu-perpage').bind('change', function () { 
+    mkdru.pollDropDowns();
+    mkdru.pz2.show(0, mkdru.state.perpage, mkdru.state.sort);
+  });
+  $('.mkdru-sort').bind('change', function () {
+    mkdru.pollDropDowns();
+    mkdru.pz2.show(0, mkdru.state.perpage, mkdru.state.sort);
+  });
 
   mkdru.pz2 = new pz2( { "onshow": mkdru.pz2Show,
               "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way