From 68f3f169859a094c737cb4009f007c0b005131b4 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 30 Mar 2014 22:15:12 -0400
Subject: [PATCH] CRM-14408 - get rid of unnecessary calls to crmAccordions

---
 js/jquery/jquery.dashboard.js                            | 2 +-
 templates/CRM/Activity/Form/Activity.tpl                 | 1 -
 templates/CRM/Activity/Form/Search.tpl                   | 2 --
 templates/CRM/Activity/Selector/Selector.tpl             | 1 -
 templates/CRM/Admin/Form/MessageTemplates.tpl            | 7 -------
 templates/CRM/Admin/Form/ScheduleReminders.tpl           | 3 ---
 templates/CRM/Campaign/Form/Search/Campaign.tpl          | 4 ----
 templates/CRM/Campaign/Form/Search/Common.tpl            | 2 --
 templates/CRM/Campaign/Form/Search/Petition.tpl          | 4 ----
 templates/CRM/Campaign/Form/Search/Survey.tpl            | 4 ----
 templates/CRM/Campaign/Form/Task/Reserve.tpl             | 1 -
 templates/CRM/Case/Form/CaseView.js                      | 2 --
 templates/CRM/Case/Form/Search.tpl                       | 7 -------
 templates/CRM/Case/Page/CustomDataView.tpl               | 7 -------
 templates/CRM/Contact/Form/Contact.tpl                   | 1 -
 templates/CRM/Contact/Form/Edit/Address.tpl              | 8 --------
 templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl   | 1 -
 templates/CRM/Contact/Form/Search/BasicCriteria.tpl      | 7 -------
 templates/CRM/Contact/Form/Search/Builder.js             | 1 -
 templates/CRM/Contact/Form/Search/Custom.tpl             | 3 ---
 .../CRM/Contact/Form/Search/Custom/ActivitySearch.tpl    | 7 -------
 .../CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl      | 7 -------
 .../Contact/Form/Search/Custom/ContributionAggregate.tpl | 7 -------
 .../Form/Search/Custom/MultipleValuesCriteria.tpl        | 7 -------
 templates/CRM/Contact/Form/Search/Custom/Proximity.tpl   | 7 -------
 templates/CRM/Contact/Form/Task/EmailCommon.js           | 1 -
 templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl      | 1 -
 templates/CRM/Contact/Form/Task/SMSCommon.tpl            | 3 ---
 templates/CRM/Contact/Import/Form/Preview.tpl            | 3 ---
 templates/CRM/Contact/Page/DashBoardDashlet.tpl          | 1 -
 templates/CRM/Contact/Page/View/Summary.js               | 1 -
 templates/CRM/Contribute/Form/AdditionalPayment.tpl      | 7 -------
 templates/CRM/Contribute/Form/Contribution.tpl           | 3 ---
 .../CRM/Contribute/Form/ContributionPage/Premium.tpl     | 1 -
 .../CRM/Contribute/Form/ContributionPage/Widget.tpl      | 8 --------
 templates/CRM/Contribute/Form/ManagePremiums.tpl         | 2 --
 templates/CRM/Contribute/Form/Search.tpl                 | 7 -------
 templates/CRM/Custom/Form/CustomData.tpl                 | 7 -------
 templates/CRM/Custom/Page/CustomDataView.tpl             | 7 -------
 .../CRM/Event/Form/ManageEvent/ScheduleReminders.tpl     | 1 -
 templates/CRM/Event/Form/ManageEvent/Tab.tpl             | 1 -
 templates/CRM/Event/Form/Participant.tpl                 | 5 -----
 templates/CRM/Event/Form/Search.tpl                      | 7 -------
 templates/CRM/Financial/Form/BatchTransaction.tpl        | 1 -
 templates/CRM/Financial/Form/FinancialBatch.tpl          | 7 -------
 templates/CRM/Financial/Page/Batch.tpl                   | 3 ---
 templates/CRM/Form/attachment.tpl                        | 9 ---------
 templates/CRM/Grant/Form/Grant.tpl                       | 3 ---
 templates/CRM/Grant/Form/Search.tpl                      | 7 -------
 templates/CRM/Mailing/Form/Approve.tpl                   | 9 ---------
 templates/CRM/Mailing/Form/Group.tpl                     | 8 --------
 templates/CRM/Mailing/Form/Schedule.tpl                  | 8 --------
 templates/CRM/Mailing/Form/Test.tpl                      | 8 --------
 templates/CRM/Member/Form/Search.tpl                     | 7 -------
 templates/CRM/Pledge/Form/Pledge.tpl                     | 7 -------
 templates/CRM/Pledge/Form/Search.tpl                     | 7 -------
 templates/CRM/Profile/Form/Search.tpl                    | 9 ---------
 templates/CRM/Report/Form/Case/Detail.tpl                | 8 --------
 templates/CRM/Report/Form/Fields.tpl                     | 8 --------
 templates/CRM/Report/Page/InstanceList.tpl               | 7 -------
 templates/CRM/Report/Page/TemplateList.tpl               | 7 -------
 templates/CRM/SMS/Form/Group.tpl                         | 8 --------
 templates/CRM/SMS/Form/Schedule.tpl                      | 5 -----
 templates/CRM/UF/Form/AdvanceSetting.tpl                 | 8 --------
 64 files changed, 1 insertion(+), 312 deletions(-)

diff --git a/js/jquery/jquery.dashboard.js b/js/jquery/jquery.dashboard.js
index acb39e845b..d4d396dea8 100644
--- a/js/jquery/jquery.dashboard.js
+++ b/js/jquery/jquery.dashboard.js
@@ -411,7 +411,7 @@
         if (!widget.fullscreenUrl) {
           return;
         }
-        CRM.loadPage(widget.fullscreenUrl).crmAccordions();
+        CRM.loadPage(widget.fullscreenUrl);
       };
       
       // Exit fullscreen mode.
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index ace2049703..c6c529de2a 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -239,7 +239,6 @@
       {literal}
         <script type="text/javascript">
           CRM.$(function($) {
-            cj().crmAccordions();
             cj('.crm-accordion-body').each( function() {
               //open tab if form rule throws error
               if ( cj(this).children( ).find('span.crm-error').text( ).length > 0 ) {
diff --git a/templates/CRM/Activity/Form/Search.tpl b/templates/CRM/Activity/Form/Search.tpl
index 1bcabfd1e5..5a458693f4 100644
--- a/templates/CRM/Activity/Form/Search.tpl
+++ b/templates/CRM/Activity/Form/Search.tpl
@@ -88,8 +88,6 @@
 {literal}
   <script type="text/javascript">
     CRM.$(function($) {
-      cj().crmAccordions();
-
       var roleId = cj('input[name=activity_role]:checked', '#Search').val();
       if (roleId) {
         cj('.description .option-' + roleId).show();
diff --git a/templates/CRM/Activity/Selector/Selector.tpl b/templates/CRM/Activity/Selector/Selector.tpl
index 9eaea86692..3b51bffceb 100644
--- a/templates/CRM/Activity/Selector/Selector.tpl
+++ b/templates/CRM/Activity/Selector/Selector.tpl
@@ -62,7 +62,6 @@
   var {/literal}{$context}{literal}oTable;
 
   CRM.$(function($) {
-    cj().crmAccordions();
     var context = {/literal}"{$context}"{literal};
     var filterSearchOnLoad = false;
     if (context == 'activity') {
diff --git a/templates/CRM/Admin/Form/MessageTemplates.tpl b/templates/CRM/Admin/Form/MessageTemplates.tpl
index 9b393555dd..6fdcb7b0da 100644
--- a/templates/CRM/Admin/Form/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Form/MessageTemplates.tpl
@@ -123,10 +123,3 @@
 </div>
 </div> <!-- end of crm-form-block -->
 {include file="CRM/Mailing/Form/InsertTokens.tpl"}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Admin/Form/ScheduleReminders.tpl b/templates/CRM/Admin/Form/ScheduleReminders.tpl
index f92f6cd91a..64a6405cfa 100644
--- a/templates/CRM/Admin/Form/ScheduleReminders.tpl
+++ b/templates/CRM/Admin/Form/ScheduleReminders.tpl
@@ -176,9 +176,6 @@
 
 {literal}
 <script type='text/javascript'>
-  CRM.$(function($) {
-    $().crmAccordions();
-  });
     var entityMapping = eval({/literal}{$entityMapping}{literal});
     var recipientMapping = eval({/literal}{$recipientMapping}{literal});
 
diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl
index 8c3ffb0e9e..57486047f1 100755
--- a/templates/CRM/Campaign/Form/Search/Campaign.tpl
+++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl
@@ -141,10 +141,6 @@
 {literal}
 <script type="text/javascript">
 
-  CRM.$(function($) {
-    cj().crmAccordions();
-  });
-
   {/literal}
   {* load selector when force *}
   {if $force and !$buildSelector}
diff --git a/templates/CRM/Campaign/Form/Search/Common.tpl b/templates/CRM/Campaign/Form/Search/Common.tpl
index 4618a0a5df..5aceb04fa5 100755
--- a/templates/CRM/Campaign/Form/Search/Common.tpl
+++ b/templates/CRM/Campaign/Form/Search/Common.tpl
@@ -157,8 +157,6 @@
 <script type="text/javascript">
 
   CRM.$(function($) {
-    cj().crmAccordions();
-
     {/literal}
     {if !$isFormSubmitted}
       buildCampaignGroups( );
diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl
index 37819a5d51..479a18263e 100755
--- a/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -123,10 +123,6 @@
 {literal}
 <script type="text/javascript">
 
- CRM.$(function($) {
-    cj().crmAccordions();
- });
-
  {/literal}
  {* load selector when force *}
  {if $force and !$buildSelector}
diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl
index b9286a2e3e..68fa79aa9b 100755
--- a/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -131,10 +131,6 @@
 {literal}
 <script type="text/javascript">
 
- CRM.$(function($) {
-    cj().crmAccordions();
- });
-
  {/literal}
  {* load selector when force *}
  {if $force and !$buildSelector}
diff --git a/templates/CRM/Campaign/Form/Task/Reserve.tpl b/templates/CRM/Campaign/Form/Task/Reserve.tpl
index bfb8db8b47..e4b857d0b5 100755
--- a/templates/CRM/Campaign/Form/Task/Reserve.tpl
+++ b/templates/CRM/Campaign/Form/Task/Reserve.tpl
@@ -82,7 +82,6 @@
 <script type="text/javascript">
 
  CRM.$(function($) {
-   cj().crmAccordions();
    setDefaultGroup( );
  });
 
diff --git a/templates/CRM/Case/Form/CaseView.js b/templates/CRM/Case/Form/CaseView.js
index 48562ba167..a6a11ad5a6 100644
--- a/templates/CRM/Case/Form/CaseView.js
+++ b/templates/CRM/Case/Form/CaseView.js
@@ -216,8 +216,6 @@
         e.preventDefault();
       });
 
-    $().crmAccordions();
-
     // Keep the state of accordions when refreshing
     var accordionStates = [];
     $('#crm-main-content-wrapper')
diff --git a/templates/CRM/Case/Form/Search.tpl b/templates/CRM/Case/Form/Search.tpl
index 39e99989b9..519700ceb2 100644
--- a/templates/CRM/Case/Form/Search.tpl
+++ b/templates/CRM/Case/Form/Search.tpl
@@ -79,13 +79,6 @@
     {/if}
 </div>
 {/if}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
 {/if}
 
 {include file="CRM/Case/Form/ActivityChangeStatusJs.tpl"}
diff --git a/templates/CRM/Case/Page/CustomDataView.tpl b/templates/CRM/Case/Page/CustomDataView.tpl
index da6ef019d1..e30695981d 100644
--- a/templates/CRM/Case/Page/CustomDataView.tpl
+++ b/templates/CRM/Case/Page/CustomDataView.tpl
@@ -82,13 +82,6 @@
 {/foreach}
 <div id="case_custom_edit"></div>
 
-{literal}
-<script type="text/javascript">
-  CRM.$(function($) {
-    cj().crmAccordions();
-  });
-</script>
-{/literal}
 {*currently delete is available only for tab custom data*}
 {if $groupId}
 <script type="text/javascript">
diff --git a/templates/CRM/Contact/Form/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl
index 5748c2c2c2..45a5340561 100644
--- a/templates/CRM/Contact/Form/Contact.tpl
+++ b/templates/CRM/Contact/Form/Contact.tpl
@@ -109,7 +109,6 @@
   <script type="text/javascript" >
   CRM.$(function($) {
     var action = "{/literal}{$action}{literal}";
-    $().crmAccordions();
 
     $('.crm-accordion-body').each( function() {
       //remove tab which doesn't have any element
diff --git a/templates/CRM/Contact/Form/Edit/Address.tpl b/templates/CRM/Contact/Form/Edit/Address.tpl
index f996ac2bec..419763da37 100644
--- a/templates/CRM/Contact/Form/Edit/Address.tpl
+++ b/templates/CRM/Contact/Form/Edit/Address.tpl
@@ -109,11 +109,3 @@ function checkLocation( object, noAlert ) {
 }
 </script>
 {/literal}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
-
diff --git a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index 21212d400d..59bf49e6d6 100644
--- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -27,7 +27,6 @@
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {
-  $().crmAccordions();
   // Bind first click of accordion header to load crm-accordion-body with snippet
   // everything else is taken care of by crmAccordions()
   $('.crm-search_criteria_basic-accordion .crm-accordion-header').addClass('active');
diff --git a/templates/CRM/Contact/Form/Search/BasicCriteria.tpl b/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
index a1db6135c7..26e576d2ff 100644
--- a/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/BasicCriteria.tpl
@@ -99,10 +99,3 @@
     </div><!-- /.crm-accordion-wrapper -->
 </div><!-- /.crm-form-block -->
 {/strip}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Contact/Form/Search/Builder.js b/templates/CRM/Contact/Form/Search/Builder.js
index fedc9fb6c7..5a572419b3 100644
--- a/templates/CRM/Contact/Form/Search/Builder.js
+++ b/templates/CRM/Contact/Form/Search/Builder.js
@@ -242,7 +242,6 @@
       $('select[id^=mapper][id$="_1"]', '#Builder').each(handleUserInputField);
     });
 
-  $().crmAccordions();
   initialize();
 
   // Fetch initial options during page refresh - it's more efficient to bundle them in a single ajax request
diff --git a/templates/CRM/Contact/Form/Search/Custom.tpl b/templates/CRM/Contact/Form/Search/Custom.tpl
index e4dee4517e..2c986fcca7 100644
--- a/templates/CRM/Contact/Form/Search/Custom.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom.tpl
@@ -132,9 +132,6 @@
 {/if}
 {literal}
 <script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
 
 function toggleContactSelection( name, qfKey, selection ){
   var Url  = "{/literal}{crmURL p='civicrm/ajax/markSelection' h=0}{literal}";
diff --git a/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl b/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
index 09e63bbcb6..9df39c842f 100644
--- a/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl
@@ -138,10 +138,3 @@
 {/if}
 </div>
 {/if}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl b/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
index 7d368b48dd..abea0492d0 100644
--- a/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/ContribSYBNT.tpl
@@ -149,10 +149,3 @@
 
 </div>
 {/if}
-{literal}
-<script type="text/javascript">
- CRM.$(function($) {
-    cj().crmAccordions();
- });
-</script>
-{/literal}
diff --git a/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl b/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
index 72f710ca40..e30e8e6dc8 100644
--- a/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/ContributionAggregate.tpl
@@ -141,10 +141,3 @@
 
 </div>
 {/if}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl b/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
index bb2c561830..08e612d472 100644
--- a/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/MultipleValuesCriteria.tpl
@@ -107,10 +107,3 @@
     </div><!-- /.crm-accordion-wrapper -->
 </div><!-- /.crm-form-block -->
 {/strip}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl b/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
index 70eb60ae7c..ba28bf771b 100644
--- a/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
+++ b/templates/CRM/Contact/Form/Search/Custom/Proximity.tpl
@@ -126,10 +126,3 @@
 
 </div>
 {/if}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.js b/templates/CRM/Contact/Form/Task/EmailCommon.js
index b2ae29ba46..3f6a1b35d6 100644
--- a/templates/CRM/Contact/Form/Task/EmailCommon.js
+++ b/templates/CRM/Contact/Form/Task/EmailCommon.js
@@ -1,7 +1,6 @@
 CRM.$(function($) {
   //do not copy & paste this - find a way to generalise it
   'use strict';
-   $().crmAccordions();
   // NOTE: Might be safer to say $('[name=_qf_Email_upload]')
    $('.form-submit').not('.cancel').on("click", function() {
      $('.form-submit').not('.cancel').attr({value: ts('Processing')});
diff --git a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
index 7cf5bcde41..71a69b40cf 100644
--- a/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/PDFLetterCommon.tpl
@@ -122,7 +122,6 @@ CRM.$(function($) {
   $('#format_id', $form).on('change', function() {
     selectFormat($(this).val());
   });
-  $().crmAccordions();
 });
 
 var currentWidth;
diff --git a/templates/CRM/Contact/Form/Task/SMSCommon.tpl b/templates/CRM/Contact/Form/Task/SMSCommon.tpl
index 6114e7b152..e6c94818fe 100644
--- a/templates/CRM/Contact/Form/Task/SMSCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/SMSCommon.tpl
@@ -57,9 +57,6 @@
 {include file="CRM/Mailing/Form/InsertTokens.tpl"}
 {literal}
 <script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
 
 {/literal}{if $max_sms_length}{literal}
 maxCharInfoDisplay();
diff --git a/templates/CRM/Contact/Import/Form/Preview.tpl b/templates/CRM/Contact/Import/Form/Preview.tpl
index f515df4004..14402993f5 100644
--- a/templates/CRM/Contact/Import/Form/Preview.tpl
+++ b/templates/CRM/Contact/Import/Form/Preview.tpl
@@ -228,9 +228,6 @@ function verify( ) {
 
 {literal}
 <script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
 
 {/literal}{if $invalidGroupName}{literal}
 cj("#new-group.collapsed").crmAccordionToggle();
diff --git a/templates/CRM/Contact/Page/DashBoardDashlet.tpl b/templates/CRM/Contact/Page/DashBoardDashlet.tpl
index a7d7cbf8b2..a57dad33dc 100644
--- a/templates/CRM/Contact/Page/DashBoardDashlet.tpl
+++ b/templates/CRM/Contact/Page/DashBoardDashlet.tpl
@@ -105,7 +105,6 @@
       return false;
     });
   });
-  cj().crmAccordions();
 </script>
 {/literal}
 </div>
diff --git a/templates/CRM/Contact/Page/View/Summary.js b/templates/CRM/Contact/Page/View/Summary.js
index ef63940e86..a425d6f833 100644
--- a/templates/CRM/Contact/Page/View/Summary.js
+++ b/templates/CRM/Contact/Page/View/Summary.js
@@ -326,6 +326,5 @@
           _.each(data.reloadBlocks, reloadBlock);
         }
       });
-    $().crmAccordions();
   });
 })(CRM.$, CRM._);
diff --git a/templates/CRM/Contribute/Form/AdditionalPayment.tpl b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
index 1004450c26..ad4bf9544d 100644
--- a/templates/CRM/Contribute/Form/AdditionalPayment.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalPayment.tpl
@@ -288,10 +288,3 @@ cj('#fee_amount').change( function() {
   {include file="CRM/common/formNavigate.tpl"}
 
 {/if}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-  cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 79f05effbf..0ae186af6e 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -538,9 +538,6 @@
 
 {literal}
 <script type="text/javascript">
-CRM.$(function($) {
-  cj().crmAccordions();
-});
 
 {/literal}
 
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
index f386064e91..41f6622b7b 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Premium.tpl
@@ -141,7 +141,6 @@
 <script type="text/javascript">
   {literal}
   CRM.$(function($) {
-    cj().crmAccordions();
 
     // bind click event to premiums_active checkbox
     cj('#premiums_active').click(function () {
diff --git a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
index 26a8d45030..23a41bf65d 100644
--- a/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
+++ b/templates/CRM/Contribute/Form/ContributionPage/Widget.tpl
@@ -139,11 +139,3 @@
 
 {* include jscript to warn if unsaved form field changes *}
 {include file="CRM/common/formNavigate.tpl"}
-
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Contribute/Form/ManagePremiums.tpl b/templates/CRM/Contribute/Form/ManagePremiums.tpl
index 231d24635d..3a55d415ed 100644
--- a/templates/CRM/Contribute/Form/ManagePremiums.tpl
+++ b/templates/CRM/Contribute/Form/ManagePremiums.tpl
@@ -172,8 +172,6 @@ function add_upload_file_block(parms) {
   }
 }
 
-cj().crmAccordions();
-
 {/literal}
 </script>
 
diff --git a/templates/CRM/Contribute/Form/Search.tpl b/templates/CRM/Contribute/Form/Search.tpl
index 5f10bdcd68..4cf9819ea2 100644
--- a/templates/CRM/Contribute/Form/Search.tpl
+++ b/templates/CRM/Contribute/Form/Search.tpl
@@ -90,11 +90,4 @@
 
 </div>
 {/if}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
 
diff --git a/templates/CRM/Custom/Form/CustomData.tpl b/templates/CRM/Custom/Form/CustomData.tpl
index a9fd459b5b..3022505f4c 100644
--- a/templates/CRM/Custom/Form/CustomData.tpl
+++ b/templates/CRM/Custom/Form/CustomData.tpl
@@ -92,13 +92,6 @@
     {/if}
     <div id="custom_group_{$group_id}_{$cgCount}"></div>
   {/foreach}
-  <script type="text/javascript">
-    {literal}
-      CRM.$(function($) {
-        cj().crmAccordions();
-      });
-    {/literal}
-  </script>
 
 {/if}
 
diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl b/templates/CRM/Custom/Page/CustomDataView.tpl
index db3e48e375..28474618b5 100644
--- a/templates/CRM/Custom/Page/CustomDataView.tpl
+++ b/templates/CRM/Custom/Page/CustomDataView.tpl
@@ -182,13 +182,6 @@
 {/if}
   {/foreach}
 {/foreach}
-{literal}
-  <script type="text/javascript">
-    CRM.$(function($) {
-      cj().crmAccordions();
-    });
-  </script>
-{/literal}
 {*currently delete is available only for tab custom data*}
 {if $groupId}
   <script type="text/javascript">
diff --git a/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl b/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl
index bb366944f6..56512947c6 100755
--- a/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/ScheduleReminders.tpl
@@ -50,7 +50,6 @@
     {* added onload javascript for source contact*}
     {literal}
       <script type="text/javascript">
-        cj().crmAccordions();
       var recipient_manual = '';
       var recipient_manual_id = null;
       var toDataUrl = "{/literal}{crmURL p='civicrm/ajax/checkemail' q='id=1&noemail=1' h=0 }{literal}"; {/literal}
diff --git a/templates/CRM/Event/Form/ManageEvent/Tab.tpl b/templates/CRM/Event/Form/ManageEvent/Tab.tpl
index b148863b4f..c77a9455ab 100644
--- a/templates/CRM/Event/Form/ManageEvent/Tab.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/Tab.tpl
@@ -103,7 +103,6 @@ CRM.$(function($) {
     $('#crm-event-name-page-title').text($(this).val());
   });
   
-  $().crmAccordions();
 });
 </script>
 {/literal}
diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index 4e085d14b5..4b76db50d8 100644
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -609,11 +609,6 @@
     }
     {/literal}
   {/if}
-  {literal}
-  CRM.$(function($) {
-    cj().crmAccordions();
-  });
-  {/literal}
 </script>
 
 {/if} {* end of main event block*}
diff --git a/templates/CRM/Event/Form/Search.tpl b/templates/CRM/Event/Form/Search.tpl
index 8b5c0f54fd..dc82502967 100644
--- a/templates/CRM/Event/Form/Search.tpl
+++ b/templates/CRM/Event/Form/Search.tpl
@@ -77,10 +77,3 @@
 
 </div>
 {/if}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Financial/Form/BatchTransaction.tpl b/templates/CRM/Financial/Form/BatchTransaction.tpl
index 293e15f531..0ce0b1dfd2 100644
--- a/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -90,7 +90,6 @@
 {literal}
 <script type="text/javascript">
 CRM.$(function($) {
-  cj().crmAccordions();
   cj('#_qf_BatchTransaction_submit-top, #_qf_BatchTransaction_submit-botttom').click(function() {
     cj('.crm-batch_transaction_search-accordion:not(.collapsed)').crmAccordionToggle();
   });
diff --git a/templates/CRM/Financial/Form/FinancialBatch.tpl b/templates/CRM/Financial/Form/FinancialBatch.tpl
index 8aa74cd7c8..55d7bfb48a 100644
--- a/templates/CRM/Financial/Form/FinancialBatch.tpl
+++ b/templates/CRM/Financial/Form/FinancialBatch.tpl
@@ -92,10 +92,3 @@
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="botttom"}</div>
 </div>
 {include file="CRM/Form/validate.tpl"}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-  $().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Financial/Page/Batch.tpl b/templates/CRM/Financial/Page/Batch.tpl
index 9d61b9bbc3..4f719afdab 100644
--- a/templates/CRM/Financial/Page/Batch.tpl
+++ b/templates/CRM/Financial/Page/Batch.tpl
@@ -24,6 +24,3 @@
  +--------------------------------------------------------------------+
 *}
 {include file="CRM/Financial/Form/Search.tpl"}
-<script type="text/javascript">
-  cj().crmAccordions();
-</script>
diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl
index ecd119c93b..97640108f5 100644
--- a/templates/CRM/Form/attachment.tpl
+++ b/templates/CRM/Form/attachment.tpl
@@ -127,15 +127,6 @@
     </div>
   </div><!-- /.crm-accordion-body -->
   </div><!-- /.crm-accordion-wrapper -->
-  {if !$noexpand}
-    {literal}
-    <script type="text/javascript">
-    CRM.$(function($) {
-       cj().crmAccordions();
-    });
-    </script>
-    {/literal}
-  {/if}
     {literal}
     <script type="text/javascript">
       function clearAttachment( element, desc ) {
diff --git a/templates/CRM/Grant/Form/Grant.tpl b/templates/CRM/Grant/Form/Grant.tpl
index 8dab641e1c..a2e00235a0 100644
--- a/templates/CRM/Grant/Form/Grant.tpl
+++ b/templates/CRM/Grant/Form/Grant.tpl
@@ -133,9 +133,6 @@
         {literal}
     });
 
-    CRM.$(function($) {
-       cj().crmAccordions();
-    });
 </script>
 {/literal}
 
diff --git a/templates/CRM/Grant/Form/Search.tpl b/templates/CRM/Grant/Form/Search.tpl
index b2436d142b..3c0ae60120 100644
--- a/templates/CRM/Grant/Form/Search.tpl
+++ b/templates/CRM/Grant/Form/Search.tpl
@@ -70,10 +70,3 @@
     </div><!-- /.crm-results-block -->
 {/if}
 </div><!-- /.crm-content-block -->
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Mailing/Form/Approve.tpl b/templates/CRM/Mailing/Form/Approve.tpl
index 0a554f0cf8..bc4d5b73be 100644
--- a/templates/CRM/Mailing/Form/Approve.tpl
+++ b/templates/CRM/Mailing/Form/Approve.tpl
@@ -58,12 +58,3 @@
 </div><!-- /.crm-accordion-wrapper -->
 
 </div>
-
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
-
diff --git a/templates/CRM/Mailing/Form/Group.tpl b/templates/CRM/Mailing/Form/Group.tpl
index 6b19195da3..e273a97c62 100644
--- a/templates/CRM/Mailing/Form/Group.tpl
+++ b/templates/CRM/Mailing/Form/Group.tpl
@@ -77,14 +77,6 @@
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
 </div>
 
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
-
 {* include jscript to warn if unsaved form field changes *}
 {include file="CRM/common/formNavigate.tpl"}
 </div>
diff --git a/templates/CRM/Mailing/Form/Schedule.tpl b/templates/CRM/Mailing/Form/Schedule.tpl
index 194856ae23..deccdaf57d 100644
--- a/templates/CRM/Mailing/Form/Schedule.tpl
+++ b/templates/CRM/Mailing/Form/Schedule.tpl
@@ -75,14 +75,6 @@
 </div>
 
 <script type="text/javascript">
-{if $preview}
-{literal}
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-{/literal}
-{/if}
-
 {literal}
 CRM.$(function($) {
    cj('#start_date_display').change( function( ) {
diff --git a/templates/CRM/Mailing/Form/Test.tpl b/templates/CRM/Mailing/Form/Test.tpl
index 1c534a497f..81a40fd635 100644
--- a/templates/CRM/Mailing/Form/Test.tpl
+++ b/templates/CRM/Mailing/Form/Test.tpl
@@ -67,11 +67,3 @@
 
 {* include jscript to warn if unsaved form field changes *}
 {include file="CRM/common/formNavigate.tpl"}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions(); 
-});
-</script>
-{/literal}
-
diff --git a/templates/CRM/Member/Form/Search.tpl b/templates/CRM/Member/Form/Search.tpl
index 76338d461f..04203947c0 100644
--- a/templates/CRM/Member/Form/Search.tpl
+++ b/templates/CRM/Member/Form/Search.tpl
@@ -71,10 +71,3 @@
   </div>
   {/if}
 </div>
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl
index 1837f7d304..4223dd56d4 100644
--- a/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/templates/CRM/Pledge/Form/Pledge.tpl
@@ -200,13 +200,6 @@ function loadPanes( id ) {
 <br />
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
 {literal}
      <script type="text/javascript">
 
diff --git a/templates/CRM/Pledge/Form/Search.tpl b/templates/CRM/Pledge/Form/Search.tpl
index 8f208fa020..7be51ed1da 100644
--- a/templates/CRM/Pledge/Form/Search.tpl
+++ b/templates/CRM/Pledge/Form/Search.tpl
@@ -79,10 +79,3 @@
 {/if}
 </div>
 {/if}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Profile/Form/Search.tpl b/templates/CRM/Profile/Form/Search.tpl
index 8735b8994d..c690b58990 100644
--- a/templates/CRM/Profile/Form/Search.tpl
+++ b/templates/CRM/Profile/Form/Search.tpl
@@ -140,15 +140,6 @@
   {if $groupId}
   </div><!-- /.crm-accordion-body -->
   </div><!-- /.crm-accordion-wrapper -->
-
-    {literal}
-      <script type="text/javascript">
-        CRM.$(function($) {
-          cj().crmAccordions();
-        });
-      </script>
-    {/literal}
-
   {/if}
 
 {elseif $statusMessage}
diff --git a/templates/CRM/Report/Form/Case/Detail.tpl b/templates/CRM/Report/Form/Case/Detail.tpl
index 3018ead021..6767c16e5d 100644
--- a/templates/CRM/Report/Form/Case/Detail.tpl
+++ b/templates/CRM/Report/Form/Case/Detail.tpl
@@ -253,14 +253,6 @@
     {/if}
     {/if} {* settings section ends *}
 
-    {literal}
-    <script type="text/javascript">
-    CRM.$(function($) {
-      cj().crmAccordions();
-    });
-    </script>
-    {/literal}
-
     {/if} {* NO print section ends *}
 
 
diff --git a/templates/CRM/Report/Form/Fields.tpl b/templates/CRM/Report/Form/Fields.tpl
index b21a32e83a..1db83d6569 100644
--- a/templates/CRM/Report/Form/Fields.tpl
+++ b/templates/CRM/Report/Form/Fields.tpl
@@ -70,12 +70,4 @@
 {/if}
 {/if} {* settings section ends *}
 
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
-
 {/if} {* NO print section ends *}
diff --git a/templates/CRM/Report/Page/InstanceList.tpl b/templates/CRM/Report/Page/InstanceList.tpl
index 63c68126e3..6fcf2ac966 100644
--- a/templates/CRM/Report/Page/InstanceList.tpl
+++ b/templates/CRM/Report/Page/InstanceList.tpl
@@ -82,10 +82,3 @@
 </div>
 {/if}
 {/strip}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
diff --git a/templates/CRM/Report/Page/TemplateList.tpl b/templates/CRM/Report/Page/TemplateList.tpl
index 0b38e6de62..3952ae88b1 100644
--- a/templates/CRM/Report/Page/TemplateList.tpl
+++ b/templates/CRM/Report/Page/TemplateList.tpl
@@ -65,11 +65,4 @@
 {/if}
 {/strip}
 
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
 </div>
diff --git a/templates/CRM/SMS/Form/Group.tpl b/templates/CRM/SMS/Form/Group.tpl
index 8d7b69c10d..393298ee0a 100644
--- a/templates/CRM/SMS/Form/Group.tpl
+++ b/templates/CRM/SMS/Form/Group.tpl
@@ -67,14 +67,6 @@
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl"}</div>
 </div>
 
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-</script>
-{/literal}
-
 {* include jscript to warn if unsaved form field changes *}
 {include file="CRM/common/formNavigate.tpl"}
 </div>
diff --git a/templates/CRM/SMS/Form/Schedule.tpl b/templates/CRM/SMS/Form/Schedule.tpl
index f494d34cc5..999f7be76e 100644
--- a/templates/CRM/SMS/Form/Schedule.tpl
+++ b/templates/CRM/SMS/Form/Schedule.tpl
@@ -73,11 +73,6 @@
 
 <script type="text/javascript">
 {if $preview}
-{literal}
-CRM.$(function($) {
-   cj().crmAccordions();
-});
-{/literal}
 {/if}
 
 {literal}
diff --git a/templates/CRM/UF/Form/AdvanceSetting.tpl b/templates/CRM/UF/Form/AdvanceSetting.tpl
index f8a72de026..5606b59197 100644
--- a/templates/CRM/UF/Form/AdvanceSetting.tpl
+++ b/templates/CRM/UF/Form/AdvanceSetting.tpl
@@ -23,14 +23,6 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-{literal}
-<script type="text/javascript">
-    CRM.$(function($) {
-        cj().crmAccordions();
-    });
-</script>
-{/literal}
-
 <div class="crm-accordion-wrapper collapsed">
  <div class="crm-accordion-header">
     Advanced Settings
-- 
2.25.1