From e4d290c449d2315d8ac42f8121467c935a769634 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 11 Dec 2013 18:08:42 -0800
Subject: [PATCH] CRM-13932 - Changelog summary tab - update deprecated jQuery

---
 templates/CRM/Contact/Page/View/Log.tpl    | 39 ++++++++--------------
 templates/CRM/Contact/Page/View/Summary.js |  7 +++-
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/templates/CRM/Contact/Page/View/Log.tpl b/templates/CRM/Contact/Page/View/Log.tpl
index 001577f2f6..c3a6363649 100644
--- a/templates/CRM/Contact/Page/View/Log.tpl
+++ b/templates/CRM/Contact/Page/View/Log.tpl
@@ -28,7 +28,7 @@
    <div class="bold">{ts}Change Log:{/ts} {$displayName}</div>
    {if $useLogging}
      <br />
-     <div class='hiddenElement' id='instance_data'> </div>
+     <div id='instance_data'><div class="crm-loading-element"></div></div>
    {else}
     <div class="form-item">
      {if $logCount > 0 }
@@ -55,35 +55,22 @@
 {if $useLogging}
 {literal}
   <script type="text/javascript">
-  cj( document ).ready( function ( ) {
-    var dataURL = {/literal}"{$instanceUrl}"{literal};
-    cj.ajax({
-      url: dataURL,
-      success: function( content ) {
-        cj('#instance_data').show( ).html( content );
-      }
-    });
-  });
+  CRM.reloadChangeLogTab = function() {
+    cj('#changeLog #instance_data').load({/literal}"{$instanceUrl}"{literal});
+  };
+  cj(function () {
+    CRM.reloadChangeLogTab();
 
-  cj('div#changeLog div#instance_data .report-pager .crm-pager-nav a').live("click", function(e) {
-    cj.ajax({
-      url: this.href + '&snippet=4&section=2',
-      success: function( content ) {
-        cj('div#changeLog div#instance_data').html(content);
-      }
+    cj('#changeLog').on('click', '.report-pager .crm-pager-nav a', function(e) {
+      cj('#changeLog #instance_data').block().load(this.href + '&snippet=4&section=2');
+      return false;
     });
-    return false;
-  });
 
-  cj('input[name="PagerBottomButton"], input[name="PagerTopButton"]').live("click", function(e) {
-    var crmpid  = (this.name == 'PagerBottomButton') ? cj('input[name="crmPID_B"]').val() : cj('input[name="crmPID"]').val();
-    cj.ajax({
-      url: cj('div#changeLog div#instance_data .report-pager .crm-pager-nav a:first').attr('href') + '&snippet=4&section=2&crmPID=' + crmpid,
-      success: function( content ) {
-        cj('div#changeLog div#instance_data').html(content);
-      }
+    cj('#changeLog').on('click', 'input[name="PagerBottomButton"], input[name="PagerTopButton"]', function(e) {
+      var url  = cj('#changeLog #instance_data .report-pager .crm-pager-nav a:first').attr('href') + '&snippet=4&section=2';
+      cj('#changeLog #instance_data').block().load(url + '&crmPID=' + cj(this).siblings('input[type=text]').val());
+      return false;
     });
-    return false;
   });
 
   </script>
diff --git a/templates/CRM/Contact/Page/View/Summary.js b/templates/CRM/Contact/Page/View/Summary.js
index dc91dc6649..8c8bbc4b1a 100644
--- a/templates/CRM/Contact/Page/View/Summary.js
+++ b/templates/CRM/Contact/Page/View/Summary.js
@@ -93,7 +93,12 @@
         $("#tab_log a em").html(response.changeLog.count);
       }
       $("#crm-record-log").replaceWith(response.changeLog.markup);
-      if ($('#Change_Log div').length) {
+      // Refresh tab contents - Advanced logging
+      if (CRM.reloadChangeLogTab) {
+        CRM.reloadChangeLogTab();
+      }
+      // Refresh tab contents - Simple logging
+      else if ($('#Change_Log div').length) {
         $('#Change_Log').load($("#tab_log a").attr('href'));
       }
     }
-- 
2.25.1