Merge pull request #2762 from amitajgaonkar/WebtestIssues

[civicrm-core.git] / templates / CRM / Core / BillingBlock.tpl

diff --git a/templates/CRM/Core/BillingBlock.tpl b/templates/CRM/Core/BillingBlock.tpl
index b0d9aa2e3e60c1293387e742ddcfce79c3f413a8..d6b48e1ae052f587281a04fca7f32b87f4d94950 100644 (file)
--- a/templates/CRM/Core/BillingBlock.tpl
+++ b/templates/CRM/Core/BillingBlock.tpl
@@ -1,8 +1,8 @@
 {*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -225,7 +225,7 @@ cj( function( ) {
     }
   }
   if(checked) {
-    cj('#billingcheckbox').attr('checked', 'checked');
+    cj('#billingcheckbox').prop('checked', true);
     cj('.billing_name_address-group').hide();
   }
 
@@ -237,7 +237,7 @@ cj( function( ) {
       var orig_id = input_ids[id];
 
       // if billing checkbox is active, copy other field into billing field
-      if(cj('#billingcheckbox').attr('checked')) {
+      if(cj('#billingcheckbox').prop('checked')) {
         cj(orig_id).val( cj(id).val() );
       };
     });
@@ -249,9 +249,9 @@ cj( function( ) {
       var orig_id = select_ids[id];
 
       // if billing checkbox is active, copy other field into billing field
-      if(cj('#billingcheckbox').attr('checked')) {
-        cj(orig_id+' option').removeAttr('selected');
-        cj(orig_id+' option[value="'+cj(id).val()+'"]').attr('selected', 'selected');
+      if(cj('#billingcheckbox').prop('checked')) {
+        cj(orig_id+' option').prop('selected', false);
+        cj(orig_id+' option[value="'+cj(id).val()+'"]').prop('selected', true);
       };
 
       if(orig_id == '#billing_country_id-5') {
@@ -273,8 +273,8 @@ cj( function( ) {
       };
       for(var id in select_ids) {
         var orig_id = select_ids[id];
-        cj(orig_id+' option').removeAttr('selected');
-        cj(orig_id+' option[value="'+cj(id).val()+'"]').attr('selected', 'selected');
+        cj(orig_id+' option').prop('selected', false);
+        cj(orig_id+' option[value="'+cj(id).val()+'"]').prop('selected', true);
       };
     } else {
       cj('.billing_name_address-group').show(200);