Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-13-15-51-23

[civicrm-core.git] / templates / CRM / common / pager.tpl

diff --git a/templates/CRM/common/pager.tpl b/templates/CRM/common/pager.tpl
index 4f56256b2d85689e6f1a7b92c9d240e46d1a2f8c..e754a22bbebdd33bd3a75ac5ccd45d44041babfc 100644 (file)
--- a/templates/CRM/common/pager.tpl
+++ b/templates/CRM/common/pager.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -60,7 +60,7 @@
         CRM.$(function($) {
           {/literal}
           var
-            $form = $('form.{$form.formClass}'),
+            $form = $({if empty($form.formClass)}'#crm-main-content-wrapper'{else}'form.{$form.formClass}'{/if}),
             numPages = {$pager->_response.numPages},
             currentPage = {$pager->_response.currentPage},
             perPageCount = {$pager->_perPage},
@@ -72,7 +72,7 @@
             if (!refreshing) {
               refreshing = true;
               var options = url ? {url: url} : {};
-              $form.off().closest('.crm-ajax-container, #crm-main-content-wrapper').crmSnippet(options).crmSnippet('refresh');
+              $form.off('.crm-pager').closest('.crm-ajax-container, #crm-main-content-wrapper').crmSnippet(options).crmSnippet('refresh');
             }
           }
           function page(num) {
@@ -115,7 +115,7 @@
             })
             .on('keyup keydown keypress', preventSubmit);
           $form
-            .on('click', 'a.ui-spinner-button', function(e) {
+            .on('click.crm-pager', 'a.ui-spinner-button', function(e) {
               var $el = $(this);
               // Update after a short delay to allow multiple clicks
               spinning !== null && window.clearTimeout(spinning);
@@ -128,7 +128,7 @@
               }, 200);
             })
             // Handle sorting, paging and alpha filtering links
-            .on('click', 'a.crm-pager-link, #alpha-filter a, th a.sorting, th a.sorting_desc, th a.sorting_asc', function(e) {
+            .on('click.crm-pager', 'a.crm-pager-link, #alpha-filter a, th a.sorting, th a.sorting_desc, th a.sorting_asc', function(e) {
               refresh($(this).attr('href'));
               e.preventDefault();
             });