From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Tue, 6 Dec 2016 06:38:28 +0000 (+0530)
Subject: replace cj with $ and fix validation error
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=025cf9a2bdb6111bd6b41368ed61896a7b181e51;p=civicrm-core.git

replace cj with $ and fix validation error
---

diff --git a/CRM/Pledge/Form/Pledge.php b/CRM/Pledge/Form/Pledge.php
index 599281f083..0c5758d275 100644
--- a/CRM/Pledge/Form/Pledge.php
+++ b/CRM/Pledge/Form/Pledge.php
@@ -355,6 +355,9 @@ class CRM_Pledge_Form_Pledge extends CRM_Core_Form {
     if (!empty($this->_values['currency'])) {
       $this->assign('currency', $this->_values['currency']);
     }
+    elseif (!empty($this->_submitValues['currency'])) {
+      $this->assign('currency', $this->_submitValues['currency']);
+    }
 
     if ($this->_id &&
       !$this->_isPending
diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl
index 12489b494e..006c8b6242 100644
--- a/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/templates/CRM/Pledge/Form/Pledge.tpl
@@ -148,46 +148,46 @@
        </table>
 {literal}
 <script type="text/javascript">
-// bind first click of accordion header to load crm-accordion-body with snippet
-// everything else taken care of by cj().crm-accordions()
-cj(document).ready( function() {
-    cj('.crm-ajax-accordion .crm-accordion-header').one('click', function() {
-      loadPanes(cj(this).attr('id'));
+  // bind first click of accordion header to load crm-accordion-body with snippet
+  // everything else taken care of by $().crm-accordions()
+  CRM.$(function($) {
+    $('.crm-ajax-accordion .crm-accordion-header').one('click', function() {
+      loadPanes($(this).attr('id'));
     });
-    cj('#currency').on('change', function() {
-      replaceCurrency(cj(this).children(':selected').text());
+    $('#currency').on('change', function() {
+      replaceCurrency($('#currency option:selected').text());
     });
-    cj('.crm-ajax-accordion:not(.collapsed) .crm-accordion-header').each(function(index) {
-      loadPanes(cj(this).attr('id'));
+    $('.crm-ajax-accordion:not(.collapsed) .crm-accordion-header').each(function(index) {
+      loadPanes($(this).attr('id'));
     });
-});
 
-function replaceCurrency(val) {
-  var eachPaymentAmout = cj('#eachPaymentAmount');
-  var pos = val.indexOf("(") + 1;
-  if (pos) {
-    val = val.slice(pos, val.lastIndexOf(")"));
-  }
-  cj('.currency-symbol').text(val).append("&nbsp;").append(eachPaymentAmout);
-}
+    function replaceCurrency(val) {
+      var eachPaymentAmout = $('#eachPaymentAmount');
+      var pos = val.indexOf("(") + 1;
+      if (pos) {
+        val = val.slice(pos, val.lastIndexOf(")"));
+      }
+      $('.currency-symbol').text(val).append("&nbsp;").append(eachPaymentAmout);
+    }
 
-// load panes function calls for snippet based on id of crm-accordion-header
-function loadPanes( id ) {
-    var url = "{/literal}{crmURL p='civicrm/contact/view/pledge' q='snippet=4&formType=' h=0}{literal}" + id;
-    {/literal}
+    // load panes function calls for snippet based on id of crm-accordion-header
+    function loadPanes( id ) {
+      var url = "{/literal}{crmURL p='civicrm/contact/view/pledge' q='snippet=4&formType=' h=0}{literal}" + id;
+      {/literal}
         {if $contributionMode}
-            url = url + "&mode={$contributionMode}";
+          url = url + "&mode={$contributionMode}";
         {/if}
-    {literal}
-   if ( ! cj('div.'+id).html() ) {
-      var loading = '<img src="{/literal}{$config->resourceBase}i/loading.gif{literal}" alt="{/literal}{ts escape='js'}loading{/ts}{literal}" />&nbsp;{/literal}{ts escape='js'}Loading{/ts}{literal}...';
-      cj('div.'+id).html(loading);
-      cj.ajax({
+      {literal}
+      if ( ! $('div.'+id).html() ) {
+        var loading = '<img src="{/literal}{$config->resourceBase}i/loading.gif{literal}" alt="{/literal}{ts escape='js'}loading{/ts}{literal}" />&nbsp;{/literal}{ts escape='js'}Loading{/ts}{literal}...';
+        $('div.'+id).html(loading);
+        $.ajax({
           url    : url,
-          success: function(data) { cj('div.'+id).html(data).trigger('crmLoad'); }
-          });
+            success: function(data) { $('div.'+id).html(data).trigger('crmLoad'); }
+        });
       }
-  }
+    }
+  });
 </script>
 {/literal}