From 32678ccbf9ca2413ce66bc449f079fa7a4e655ed Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 15 Aug 2014 13:27:34 +0100
Subject: [PATCH] JS cleanup - switch to new document ready syntax

---
 templates/CRM/Admin/Form/Job.tpl              | 24 +++++++++--------
 .../CRM/Admin/Form/Preferences/Display.tpl    | 10 ++++---
 templates/CRM/Campaign/Form/Campaign.tpl      | 12 ++++-----
 templates/CRM/Campaign/Form/ResultOptions.tpl |  2 +-
 templates/CRM/Case/Form/Case.tpl              |  4 +--
 .../CRM/Contact/Import/Form/DataSource.tpl    |  2 +-
 templates/CRM/Contact/Page/View/Note.tpl      | 22 ++++++++--------
 .../CRM/Event/Cart/Form/Checkout/Payment.tpl  | 24 ++++++++---------
 .../CRM/Event/Form/ManageEvent/EventInfo.tpl  |  2 +-
 .../CRM/Event/Form/ManageEvent/Location.tpl   | 26 +++++++++----------
 templates/CRM/Mailing/Form/Search.tpl         | 14 +++++-----
 templates/CRM/Pledge/Form/Payment.tpl         | 15 +++++------
 templates/CRM/Price/Form/LineItem.tpl         | 12 ++++-----
 templates/CRM/Price/Form/ParticipantCount.tpl |  2 +-
 templates/CRM/Price/Page/LineItem.tpl         |  2 +-
 templates/CRM/Report/Form/Instance.tpl        |  4 +--
 16 files changed, 89 insertions(+), 88 deletions(-)

diff --git a/templates/CRM/Admin/Form/Job.tpl b/templates/CRM/Admin/Form/Job.tpl
index 5be58410d5..6faa276abd 100644
--- a/templates/CRM/Admin/Form/Job.tpl
+++ b/templates/CRM/Admin/Form/Job.tpl
@@ -66,33 +66,35 @@
         <div class="description">{ts}Put in the API method name. You need to enter pieces of full API function name as described in the documentation.{/ts}</div>
 <script>
 {literal}
+CRM.$(function($) {
   function assembleName( ) {
 
     // dunno yet
     var apiName = "";
 
     // building prefix
-    if( cj('#api_action').val() == '' ) {
-      cj('#fname').html( "<em>API name will start appearing here as you type in fields below.</em>" );
+    if( $('#api_action').val() == '' ) {
+      $('#fname').html( "<em>API name will start appearing here as you type in fields below.</em>" );
       return;
     }
 
-    apiPrefix = 'api'
+    var apiPrefix = 'api'
 
     // building entity
-    var apiEntity = cj('#api_entity').val().replace( /([A-Z])/g, function($1) {
-                                                   return $1.toLowerCase();
-                                                   });
+    var apiEntity = $('#api_entity').val().replace( /([A-Z])/g, function($1) {
+      return $1.toLowerCase();
+    });
     // building action
-    var apiAction = cj('#api_action').val().replace(/(\_[a-z])/g, function($1) {return $1.toUpperCase().replace('_','');});
+    var apiAction = $('#api_action').val().replace(/(\_[a-z])/g, function($1) {return $1.toUpperCase().replace('_','');});
     apiName = apiPrefix + '.' + apiEntity + '.' + apiAction;
-    cj('#fname').text( apiName );
+    $('#fname').text( apiName );
   }
 
   // bind to different events to build API name live
-  cj(document).ready( function() { assembleName() } );
-  cj('#api_entity').change( function() { assembleName() } );
-  cj('#api_action').keyup( function() { assembleName() } );
+  $('#api_entity').change(assembleName)
+  $('#api_action').change(assembleName).keyup(assembleName);
+  assembleName();
+});
 
 {/literal}
 </script>
diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl
index 5b61d2c680..c95ac861a5 100644
--- a/templates/CRM/Admin/Form/Preferences/Display.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Display.tpl
@@ -172,11 +172,13 @@
         <td class="label">{$form.wysiwyg_input_format.label}</td>
         <td>
           {$form.wysiwyg_input_format.html}{literal}
-            <script type="text/javascript">cj(document).ready(function () {
-                if (cj('#editor_id').val() == 4) {
-                  cj('#crm-preferences-display-form-block-wysiwyg_input_format').show();
+            <script type="text/javascript">
+              CRM.$(function($) {
+                if ($('#editor_id').val() == 4) {
+                  $('#crm-preferences-display-form-block-wysiwyg_input_format').show();
                 }
-              });</script>
+              });
+            </script>
           {/literal}
           <br/>
           <span class="description">
diff --git a/templates/CRM/Campaign/Form/Campaign.tpl b/templates/CRM/Campaign/Form/Campaign.tpl
index e4951c54cb..2e02d66fbf 100644
--- a/templates/CRM/Campaign/Form/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Campaign.tpl
@@ -112,14 +112,14 @@
 
 {literal}
 <script type="text/javascript">
-cj( document ).ready( function( ) {
+  CRM.$(function($) {
     {/literal}{if $customDataSubType}
-     CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
-        {else}
-     CRM.buildCustomData( '{$customDataType}' );
-        {/if}
+      CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
+    {else}
+      CRM.buildCustomData( '{$customDataType}' );
+    {/if}
     {literal}
-});
+  });
 </script>
 {/literal}
 
diff --git a/templates/CRM/Campaign/Form/ResultOptions.tpl b/templates/CRM/Campaign/Form/ResultOptions.tpl
index 1572347c73..0818b086d8 100644
--- a/templates/CRM/Campaign/Form/ResultOptions.tpl
+++ b/templates/CRM/Campaign/Form/ResultOptions.tpl
@@ -163,7 +163,7 @@
       }, "json" );
   }
 
-    cj(document).ready( function( ) {
+    CRM.$(function($) {
         showOptionSelect( );
     });
 
diff --git a/templates/CRM/Case/Form/Case.tpl b/templates/CRM/Case/Form/Case.tpl
index 6f8785a3f8..04576a9200 100644
--- a/templates/CRM/Case/Form/Case.tpl
+++ b/templates/CRM/Case/Form/Case.tpl
@@ -133,8 +133,8 @@
     {include file="CRM/common/customData.tpl"}
     {literal}
       <script type="text/javascript">
-      cj(document).ready(function() {
-           var customDataSubType = cj('#case_type_id').val();
+      CRM.$(function($) {
+           var customDataSubType = $('#case_type_id').val();
            if ( customDataSubType ) {
               CRM.buildCustomData( {/literal}'{$customDataType}'{literal}, customDataSubType );
            } else {
diff --git a/templates/CRM/Contact/Import/Form/DataSource.tpl b/templates/CRM/Contact/Import/Form/DataSource.tpl
index 7850178d51..3192f005a9 100644
--- a/templates/CRM/Contact/Import/Form/DataSource.tpl
+++ b/templates/CRM/Contact/Import/Form/DataSource.tpl
@@ -105,7 +105,7 @@
 
   {literal}
     <script type="text/javascript">
-      cj(document).ready(function() {
+      CRM.$(function($) {
          //build data source form block
          buildDataSourceFormBlock();
          buildSubTypes();
diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl
index 53b661a2fe..2bcf2d167c 100644
--- a/templates/CRM/Contact/Page/View/Note.tpl
+++ b/templates/CRM/Contact/Page/View/Note.tpl
@@ -216,18 +216,18 @@
 
     <script type="text/javascript">
     {literal}
-        cj(document).ready( function() {
-            var tabId = cj.fn.dataTableSettings[0].sInstance;
+      CRM.$(function($) {
+        var tabId = $.fn.dataTableSettings[0].sInstance;
 
-            cj('table#'+ tabId).dataTable().fnSettings().aoDrawCallback.push( {
-                    "fn": function () {
-                        cj('#'+ tabId +' tr').each( function() {
-                            drawCommentRows(this.id)
-                        });
-                    },
-                    "sName": "user"
-            } );
-        });
+        $('table#'+ tabId).dataTable().fnSettings().aoDrawCallback.push( {
+          "fn": function () {
+            $('#'+ tabId +' tr').each( function() {
+              drawCommentRows(this.id)
+            });
+          },
+          "sName": "user"
+        } );
+      });
 
     {/literal}
     </script>
diff --git a/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl b/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl
index 81a7a4aa7d..c7962ee963 100644
--- a/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl
+++ b/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl
@@ -155,23 +155,23 @@
 <script type="text/javascript">
 var pay_later_sel = "input#{$form.is_pay_later.name}";
 {literal}
-cj("document").ready(function() {
+CRM.$(function($) {
   function refresh() {
-    var is_pay_later = cj(pay_later_sel).prop("checked");
-    cj(".credit_card_info-group").toggle(!is_pay_later);
-    cj(".pay-later-instructions").toggle(is_pay_later);
-    cj("div.billingNameInfo-section .description").html(is_pay_later ? "Enter the billing address at which you can be invoiced." : "Enter the name as shown on your credit or debit card, and the billing address for this card.");
+    var is_pay_later = $(pay_later_sel).prop("checked");
+    $(".credit_card_info-group").toggle(!is_pay_later);
+    $(".pay-later-instructions").toggle(is_pay_later);
+    $("div.billingNameInfo-section .description").html(is_pay_later ? "Enter the billing address at which you can be invoiced." : "Enter the name as shown on your credit or debit card, and the billing address for this card.");
   }
-  cj("input#source").prop('disabled', true);
+  $("input#source").prop('disabled', true);
 
-  cj(pay_later_sel).change(function() {
+  $(pay_later_sel).change(function() {
     refresh();
   });
-  cj(".payment_type-section :radio").change(function() {
-    var sel = cj(this).attr("id");
-    cj(".check_number-section").toggle(
-        cj(this).is(":checked") &&
-        cj("label[for="+sel+"]").html() == "{/literal}{ts escape='js'}Check{/ts}{literal}"
+  $(".payment_type-section :radio").change(function() {
+    var sel = $(this).attr("id");
+    $(".check_number-section").toggle(
+        $(this).is(":checked") &&
+        $("label[for="+sel+"]").html() == "{/literal}{ts escape='js'}Check{/ts}{literal}"
     );
   });
   refresh();
diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index c524e47099..a1980b18f7 100644
--- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -156,7 +156,7 @@
   {include file="CRM/common/customData.tpl"}
   {literal}
     <script type="text/javascript">
-      cj(document).ready(function() {
+      CRM.$(function($) {
         {/literal}
         {if $customDataSubType}
           CRM.buildCustomData( '{$customDataType}', {$customDataSubType} );
diff --git a/templates/CRM/Event/Form/ManageEvent/Location.tpl b/templates/CRM/Event/Form/ManageEvent/Location.tpl
index 1ac4deb8a3..d5741974b6 100644
--- a/templates/CRM/Event/Form/ManageEvent/Location.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Location.tpl
@@ -108,7 +108,7 @@ if ( {/literal}"{$locUsed}"{literal} ) {
    displayMessage( true );
 }
 
-cj(document).ready(function() {
+CRM.$(function($) {
   //FIX ME: by default load 2 blocks and hide add and delete links
   //we should make additional block function more flexible to set max block limit
   buildBlocks('Email');
@@ -116,7 +116,7 @@ cj(document).ready(function() {
 
   // build blocks only if it is not built
   function buildBlocks(element) {
-    if (!cj('[id='+ element +'_Block_2]').length) {
+    if (!$('[id='+ element +'_Block_2]').length) {
       buildAdditionalBlocks(element, 'CRM_Event_Form_ManageEvent_Location');
     }
   }
@@ -124,18 +124,18 @@ cj(document).ready(function() {
   hideAddDeleteLinks('Email');
   hideAddDeleteLinks('Phone');
   function hideAddDeleteLinks(element) {
-    cj('#add'+ element).hide();
-    cj('[id='+ element +'_Block_2] a:last').hide();
+    $('#add'+ element).hide();
+    $('[id='+ element +'_Block_2] a:last').hide();
   }
 
-  cj('#loc_event_id').change(function() {
-    cj.ajax({
+  $('#loc_event_id').change(function() {
+    $.ajax({
       url: CRM.url('civicrm/ajax/locBlock', 'reset=1'),
       type: 'POST',
-      data: {'lbid': cj(this).val()},
+      data: {'lbid': $(this).val()},
       dataType: 'json',
       success: function(data) {
-        var selectLocBlockId = cj('#loc_event_id').val();
+        var selectLocBlockId = $('#loc_event_id').val();
         for(i in data) {
           if ( i == 'count_loc_used' ) {
             if ( ((selectLocBlockId == locBlockId) && data['count_loc_used'] > 1) ||
@@ -146,10 +146,10 @@ cj(document).ready(function() {
             }
           } else {
             if (i == 'phone_1_phone_type_id' || i == 'phone_2_phone_type_id') {
-              cj('#'+i).select2('val', data[i]);
+              $('#'+i).select2('val', data[i]);
             }
             else {
-              cj('#'+i).val(data[i]);
+              $('#'+i).val(data[i]);
             }
           }
         }
@@ -160,11 +160,11 @@ cj(document).ready(function() {
 });
 
 function displayMessage( set ) {
-   cj(document).ready(function() {
+   CRM.$(function($) {
      if ( set ) {
-       cj('#locUsedMsg').html( locUsedMsgTxt ).addClass('status');
+       $('#locUsedMsg').html( locUsedMsgTxt ).addClass('status');
      } else {
-       cj('#locUsedMsg').html( ' ' ).removeClass('status');
+       $('#locUsedMsg').html( ' ' ).removeClass('status');
      }
    });
 }
diff --git a/templates/CRM/Mailing/Form/Search.tpl b/templates/CRM/Mailing/Form/Search.tpl
index 88d57ab12f..728fbad2eb 100644
--- a/templates/CRM/Mailing/Form/Search.tpl
+++ b/templates/CRM/Mailing/Form/Search.tpl
@@ -75,20 +75,20 @@
 
 {literal}
 <script type="text/javascript">
-  cj(document).ready( function( ) {
-    var archiveOption = cj("input[name^='is_archived']:radio");
-    cj('#status_unscheduled').change(function() {
-      if (cj(this).prop('checked') ) {
+  CRM.$(function($) {
+    var archiveOption = $("input[name^='is_archived']:radio");
+    $('#status_unscheduled').change(function() {
+      if ($(this).prop('checked') ) {
         archiveOption.prop({checked: false, disabled: true}).change();
       } else {
         archiveOption.prop('disabled', false);
       }
     }).trigger('change');
     archiveOption.change(function() {
-      if (cj("input[name^='is_archived']:radio:checked").length) {
-        cj('#status_unscheduled').prop({checked: false, disabled: true}).change();
+      if ($("input[name^='is_archived']:radio:checked").length) {
+        $('#status_unscheduled').prop({checked: false, disabled: true}).change();
       } else {
-        cj('#status_unscheduled').prop('disabled', false);
+        $('#status_unscheduled').prop('disabled', false);
       }
     }).trigger('change');
   });
diff --git a/templates/CRM/Pledge/Form/Payment.tpl b/templates/CRM/Pledge/Form/Payment.tpl
index 510ba78d82..d92d3e63e4 100644
--- a/templates/CRM/Pledge/Form/Payment.tpl
+++ b/templates/CRM/Pledge/Form/Payment.tpl
@@ -45,13 +45,12 @@
 </div>
 {literal}
 <script type="text/javascript">
-cj(document).ready( function() {
-    cj('#adjust-option-type').hide();
-});
-function adjustPayment( ) {
-cj('#adjust-option-type').show();
-cj("#scheduled_amount").removeAttr("READONLY");
-cj("#scheduled_amount").css('background-color', '#ffffff');
-}
+  CRM.$(function($) {
+    $('#adjust-option-type').hide();
+  });
+  function adjustPayment( ) {
+    cj('#adjust-option-type').show();
+    cj("#scheduled_amount").removeAttr("READONLY").css('background-color', '#ffffff');
+  }
 </script>
 {/literal}
diff --git a/templates/CRM/Price/Form/LineItem.tpl b/templates/CRM/Price/Form/LineItem.tpl
index c583f2b66b..a085961e32 100644
--- a/templates/CRM/Price/Form/LineItem.tpl
+++ b/templates/CRM/Price/Form/LineItem.tpl
@@ -84,17 +84,17 @@
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {
-  cj(document).on('blur', '.distribute', function() {
+  $(document).on('blur', '.distribute', function() {
    var totalAmount = 0;
-   cj('.distribute').each(function (){
-   if(cj(this).val( ).length > 0){
-    totalAmount     = parseFloat( totalAmount ) + parseFloat( cj(this).val( ) );
+   $('.distribute').each(function (){
+   if($(this).val( ).length > 0){
+    totalAmount     = parseFloat( totalAmount ) + parseFloat( $(this).val( ) );
     }
    });
 
-    cj('.editPayment').text('$ '+totalAmount);
+    $('.editPayment').text('$ '+totalAmount);
       var unlocateAmount = '{/literal}{$total}{literal}';
-      cj('.unlocateAmount').text('$ '+(unlocateAmount - totalAmount));
+      $('.unlocateAmount').text('$ '+(unlocateAmount - totalAmount));
    });
 });
 </script>
diff --git a/templates/CRM/Price/Form/ParticipantCount.tpl b/templates/CRM/Price/Form/ParticipantCount.tpl
index bde0774cc7..9a25771ed9 100644
--- a/templates/CRM/Price/Form/ParticipantCount.tpl
+++ b/templates/CRM/Price/Form/ParticipantCount.tpl
@@ -32,7 +32,7 @@
     var pPartiRef   = Array( );
     var optionSep   = '|';
 
-    cj(document).ready( function( ) {
+    CRM.$(function($) {
       pricesetParticipantCount( );
       allowGroupOnWaitlist(0, pPartiCount);
     });
diff --git a/templates/CRM/Price/Page/LineItem.tpl b/templates/CRM/Price/Page/LineItem.tpl
index 600e00826b..29d82f3b5e 100644
--- a/templates/CRM/Price/Page/LineItem.tpl
+++ b/templates/CRM/Price/Page/LineItem.tpl
@@ -108,7 +108,7 @@
 {/if}
 {literal}
 <script type="text/javascript">
-cj(document).ready(function($) {
+CRM.$(function($) {
   {/literal}
     var comma = '{$config->monetaryThousandSeparator}';
     var dot = '{$config->monetaryDecimalPoint}';
diff --git a/templates/CRM/Report/Form/Instance.tpl b/templates/CRM/Report/Form/Instance.tpl
index 2fc9f42fd8..0e6e1e7362 100644
--- a/templates/CRM/Report/Form/Instance.tpl
+++ b/templates/CRM/Report/Form/Instance.tpl
@@ -131,11 +131,9 @@
 
 {literal}
 <script type="text/javascript">
-  cj(document).ready(function() {
-    cj('#title').data('initial_value', cj('#title').val());
-  });
   CRM.$(function($) {
       var formName = {/literal}"{$form.formName}"{literal};
+      $('#title').data('initial_value', $('#title').val());
       $('#_qf_' + formName + '_submit_save').click (
           function(){
               if ( $('#is_navigation').prop('checked') && $('#parent_id').val() == '') {
-- 
2.25.1