CRM-13932 - Fix deprecated useages of jQuery.attr

diff --git a/js/jquery/jquery.crmasmselect.js b/js/jquery/jquery.crmasmselect.js
index ffee488329987e11beefc1f2bc189b7ad3260faa..49b93e123987cf9c3c313c73c3958113d23429ec 100644 (file)
--- a/js/jquery/jquery.crmasmselect.js
+++ b/js/jquery/jquery.crmasmselect.js
@@ -212,7 +212,7 @@
 
                                // select the firm item from the regular select that we created
 
-                               $select.children(":eq(0)").attr("selected", true); 
+                               $select.children(":eq(0)").prop("selected", true);
                        }
 
                        function disableSelectOption($option) {
@@ -222,8 +222,8 @@
                                // we apply a class that reproduces the disabled look in other browsers
 
                                $option.addClass(options.optionDisabledClass)
-                                       .attr("selected", false)
-                                       .attr("disabled", true);
+                                       .prop("selected", false)
+                                       .prop("disabled", true);
 
                                if(options.hideWhenAdded) $option.hide();
                                if($.browser.msie) $select.hide().show(); // this forces IE to update display
@@ -234,7 +234,7 @@
                                // given an already disabled select option, enable it
 
                                $option.removeClass(options.optionDisabledClass)
-                                       .attr("disabled", false);
+                                       .prop("disabled", false);
 
                                if(options.hideWhenAdded) $option.show();
                                if($.browser.msie) $select.hide().show(); // this forces IE to update display
@@ -271,7 +271,7 @@
 
                                if(!buildingSelect) {
                                        if($O.is(":selected")) return; // already have it
-                                       $O.attr('selected', true); 
+                                       $O.prop('selected', true);
                                }
 
                                if(options.addItemTarget == 'top' && !buildingSelect) {
@@ -333,7 +333,7 @@
                                if(highlightItem == undefined) var highlightItem = true; 
                                var $O = $('#' + optionId); 
 
-                               $O.attr('selected', false); 
+                               $O.prop('selected', false);
                                $item = $ol.children("li[rel=" + optionId + "]");
 
                                dropListItemHide($item); 

diff --git a/js/view/crm.designer.js b/js/view/crm.designer.js
index 684b60f6f2565a23b24d96b69f27e8e4ebc934f9..0098ca9b1e65201989765c0aaaf80a451a587ca6 100644 (file)
--- a/js/view/crm.designer.js
+++ b/js/view/crm.designer.js
@@ -203,7 +203,7 @@
     },
     onUfChanged: function(isUfUnsaved) {
       if (isUfUnsaved) {
-        this.$('.crm-designer-save').removeAttr('style').removeAttr('disabled');
+        this.$('.crm-designer-save').removeAttr('style').prop('disabled', false);
       }
     },
     doSave: function(event) {
@@ -763,7 +763,6 @@
       this.form.commit();
       this.$('.field-is_multi_summary').toggle(this.options.fieldSchema.civiIsMultiple ? true : false);
       this.$('.field-in_selector').toggle(this.model.isInSelectorAllowed());
-      // this.$(':input').attr('disabled', this.model.get("is_reserved") == 1);
 
       if (!this.model.isInSelectorAllowed() && this.model.get('in_selector') != "0") {
         this.model.set('in_selector', "0");

diff --git a/js/view/crm.profile-selector.js b/js/view/crm.profile-selector.js
index 438d58b708938f0a29bf7fcf01f75093f8d2ba78..19660552f86e7468f1859c806dc7d45445a49561 100644 (file)
--- a/js/view/crm.profile-selector.js
+++ b/js/view/crm.profile-selector.js
@@ -63,7 +63,7 @@
       this.doPreview();
     },
     toggleButtons: function() {
-      this.$('.crm-profile-selector-edit,.crm-profile-selector-copy').attr('disabled', !this.hasUfGroupId());
+      this.$('.crm-profile-selector-edit,.crm-profile-selector-copy').prop('disabled', !this.hasUfGroupId());
     },
     hasUfGroupId: function() {
       return (this.getUfGroupId() && this.getUfGroupId() != '') ? true : false;

diff --git a/templates/CRM/Batch/Form/Entry.js b/templates/CRM/Batch/Form/Entry.js
index 78ab8337de5b5ea380c4d3465c507c90f653fa6b..6b81bd19621a544cf7b1f50b09feb34ad4b4aee2 100644 (file)
--- a/templates/CRM/Batch/Form/Entry.js
+++ b/templates/CRM/Batch/Form/Entry.js
@@ -44,7 +44,7 @@ cj(function () {
   else{
     cj('select[id^="member_option_"]').each(function () {
       if (cj(this).val() == 1) {
-        cj(this).attr('disabled', true);
+        cj(this).prop('disabled', true);
       }
     });
 
@@ -95,7 +95,7 @@ function updateContactInfo(blockNo, prefix) {
       if(CRM.batch.type_id == 2) {
       CRM.api('Membership', 'get', {
           'sequential': '1',
-          'contact_id': contactId,
+          'contact_id': contactId
         },
         { success: function (data) {
           if (data.count > 0) {
@@ -108,7 +108,7 @@ function updateContactInfo(blockNo, prefix) {
               },
               { success: function (data) {
                 var memTypeContactId = data.values[0].member_of_contact_id;
-                cj('select[id="member_option_' + blockNo + '"]').removeAttr('disabled').val(2);
+                cj('select[id="member_option_' + blockNo + '"]').prop('disabled', false).val(2);
                 cj('select[id="field_' + blockNo + '_membership_type_0"]').val(memTypeContactId).change();
                 cj('select[id="field_' + blockNo + '_membership_type_1"]').val(membershipTypeId).change();
                 setDateFieldValue('join_date', membershipJoinDate, blockNo)

diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl
index 4e3ea15ccf9a1f400c99e03bb80ba2052e2350e5..6f84ef48b495190f6f9710ba75cc071430b99996 100644 (file)
--- a/templates/CRM/Batch/Form/Entry.tpl
+++ b/templates/CRM/Batch/Form/Entry.tpl
@@ -140,7 +140,7 @@ cj(function () {
   {/literal}{else}{literal}
   cj('select[id^="member_option_"]').each(function () {
     if (cj(this).val() == 1) {
-      cj(this).attr('disabled', true);
+      cj(this).prop('disabled', true);
     }
   });
 
@@ -338,7 +338,7 @@ function updateContactInfo(blockNo, prefix) {
               },
               { success: function (data) {
                 var memTypeContactId = data.values[0].member_of_contact_id;
-                cj('select[id="member_option_' + blockNo + '"]').removeAttr('disabled').val(2);
+                cj('select[id="member_option_' + blockNo + '"]').prop('disabled', false).val(2);
                 cj('select[id="field_' + blockNo + '_membership_type_0"]').val(memTypeContactId).change();
                 cj('select[id="field_' + blockNo + '_membership_type_1"]').val(membershipTypeId).change();
                 setDateFieldValue('join_date', membershipJoinDate, blockNo)

diff --git a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
index 230e7be1c60bc03dd83b2dcf97daf188b16f2d82..aaf99214a7af6283f427135e211176a4d155d9b9 100644 (file)
--- a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
+++ b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
@@ -25,8 +25,8 @@
                    value = cj(this).val();
                    if ( value == 'current_campaign' || value == 'past_campaign' ) {
                         cj(this).css( 'color', 'black' );
-                        cj(this).attr( 'disabled', true );
-                  cj(this).attr( 'selected', false);
+                        cj(this).prop( 'disabled', true );
+                        cj(this).prop( 'selected', false);
                         cj(this).addClass( 'asmOptionDisabled' );
                    }
               });

diff --git a/templates/CRM/Contact/Form/Relationship.tpl b/templates/CRM/Contact/Form/Relationship.tpl
index 6510367c282ba2df5eb3c484fddf173e019dae7d..5cc6f68d9530c7d8b26de6c0b2ec49d8e3f0fc1c 100644 (file)
--- a/templates/CRM/Contact/Form/Relationship.tpl
+++ b/templates/CRM/Contact/Form/Relationship.tpl
@@ -143,14 +143,14 @@
                         contactAutocomplete.unautocomplete( );
 
                         if ( relationshipTypeValue ) {
-                            cj('#profiles_1').attr('disabled', false);
-                            contactAutocomplete.attr('disabled', false);
+                            cj('#profiles_1').prop('disabled', false);
+                            contactAutocomplete.prop('disabled', false);
                             contactAutocomplete.addClass('ac_input');
                             buildCreateNewSelect( 'profiles_1', relationshipTypeValue );
                         } else {
-                            cj('#profiles_1').attr('disabled', true);
+                            cj('#profiles_1').prop('disabled', true);
                             contactAutocomplete.removeClass('ac_input');
-                            contactAutocomplete.attr('disabled', true);
+                            contactAutocomplete.prop('disabled', true);
                         }
                     }
 

diff --git a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
index 0316619aedd063b79844bab40a1691cfc9b16811..f4ef9274d5efad4d9846a61e2fa8fe88a923e58b 100644 (file)
--- a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
@@ -101,14 +101,14 @@
             cj('#groupselect').show();
             cj('#group_type').val('') ;
             cj('#crmasmList2 li').remove();
-            cj('#crmasmSelect2').children().removeClass('asmOptionDisabled').removeAttr('disabled');
+            cj('#crmasmSelect2').children().removeClass('asmOptionDisabled').prop('disabled', false);
         }
         function showGroupTypeSearch(){
             cj('#groupselect').hide();
             cj('#grouptypeselect').show();
             cj('#group').val('') ;
             cj('#crmasmList1 li').remove();
-            cj('#crmasmSelect1').children().removeClass('asmOptionDisabled').removeAttr('disabled');
+            cj('#crmasmSelect1').children().removeClass('asmOptionDisabled').prop('disabled', false);
         }
 
         cj(function(){

diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.js b/templates/CRM/Contact/Form/Task/EmailCommon.js
index bb7610e4c909b21dd44172ace5c3e43993d660e6..d58d7e990f62f150cf637711f2efdeca834673fd 100644 (file)
--- a/templates/CRM/Contact/Form/Task/EmailCommon.js
+++ b/templates/CRM/Contact/Form/Task/EmailCommon.js
@@ -9,7 +9,7 @@ cj(function ($) {
      // for some browsers like chrome. Used for purpose of
      // submit the form and stop accidental multiple clicks
      setTimeout(function(){
-       $('.form-submit').not('.cancel').attr({disabled: 'disabled'});
+       $('.form-submit').not('.cancel').prop({disabled: true});
      }, 0);
    });
 });

diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
index e283801dc7471796ad898375ce453c1b6a2ce314..b4e2a444c0965b020c40fab000ff7bb6bb02231a 100644 (file)
--- a/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
@@ -46,9 +46,9 @@
           installments.val( '' );
        }
 
-       frUnit.attr( 'disabled', isDisabled );
-       frInerval.attr( 'disabled', isDisabled );
-       installments.attr( 'disabled', isDisabled );
+       frUnit.prop( 'disabled', isDisabled );
+       frInerval.prop( 'disabled', isDisabled );
+       installments.prop( 'disabled', isDisabled );
    }
 
    function buildRecurBlock( processorId ) {

diff --git a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
index 726371eaa9815f53701a5a1d36e4dfb32e7630cd..f218ab69367f7be49792eebd7b600889a79ab8bc 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
@@ -235,7 +235,7 @@ function setLocationDetails(contactID) {
         }
         else if (data[ele].type == 'Multi-Select') {
           for (var selectedOption in data[ele].value) {
-            cj('#' + ele + " option[value='" + selectedOption + "']").attr('selected', 'selected');
+            cj('#' + ele + " option[value='" + selectedOption + "']").prop('selected', true);
           }
         }
         else if (data[ele].type == 'Autocomplete-Select') {

diff --git a/templates/CRM/Core/BillingBlock.tpl b/templates/CRM/Core/BillingBlock.tpl
index 9efb53a3ce3ab5379538e3ed2d97429ef34a76e2..129fce7fa904a1cfdc33f3984e4cb9a1bb2198c2 100644 (file)
--- a/templates/CRM/Core/BillingBlock.tpl
+++ b/templates/CRM/Core/BillingBlock.tpl
@@ -250,8 +250,8 @@ cj( function( ) {
 
       // if billing checkbox is active, copy other field into billing field
       if(cj('#billingcheckbox').prop('checked')) {
-        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);
       };
 
       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);

diff --git a/templates/CRM/Custom/Form/Group.tpl b/templates/CRM/Custom/Form/Group.tpl
index 7c13b83ecb7c0621497289d383e7b15559226d81..d11b6e17cb98766b985f517ff08dbcfebf57686e 100644 (file)
--- a/templates/CRM/Custom/Form/Group.tpl
+++ b/templates/CRM/Custom/Form/Group.tpl
@@ -146,12 +146,12 @@ cj(function($) {
   function showRange(onFormLoad) {
     if(cj("#is_multiple :checked").length) {
       cj("tr#multiple").show();
-      cj("select#style option[value='Tab']").attr("selected", "selected");
+      cj("select#style option[value='Tab']").prop("selected", true);
     }
     else {
       cj("tr#multiple").hide();
       if (!onFormLoad) {
-        cj("select#style option[value='Inline']").attr("selected", "selected");
+        cj("select#style option[value='Inline']").prop("selected", true);
       }
     }
   }

diff --git a/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl b/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl
index 3820afeff9db85dcbb4de978f172b480edc3b152..f347b381a6e94e5790aeec0ae942fbd6975edeee 100644 (file)
--- a/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl
+++ b/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl
@@ -27,7 +27,7 @@ for (var radio_id in session_options)
   var label_sel = "label[for=" + radio_id + "]";
   cj("#"+radio_id +","+ label_sel).wrapAll("<li>");
   if (info.session_full) {
-    cj("#"+radio_id).attr('disabled', 'disabled');
+    cj("#"+radio_id).prop('disabled', true);
     cj("#"+radio_id).after('<span class="error">{/literal}{ts escape='js'}Session is Full{/ts}{literal}: </span>');
   }
   var more = cj('<a href="#">{/literal}{ts escape='js'}more info{/ts}{literal}</a>').click(function(event) {

diff --git a/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl b/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl
index 2dd3e30275bc089aa2b6a380966c2e3e3ccc6eae..cca4692f7fc0d4f2ba8dae305f580f29a913087d 100644 (file)
--- a/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl
+++ b/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl
@@ -163,7 +163,7 @@ cj("document").ready(function() {
     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.");
   }
-  cj("input#source").attr('disabled', 'disabled');
+  cj("input#source").prop('disabled', true);
 
   cj(pay_later_sel).change(function() {
     refresh();

diff --git a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
index 86df08880de808183bd6a99e0fadd6d2d7718414..1e40f861d26a8da7d963bdfa22d346cfb65719d8 100644 (file)
--- a/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/EventInfo.tpl
@@ -181,7 +181,7 @@ function reloadWindow(tempId) {
 
    //freeze the event type element
    //when template form is loading.
-   cj( "#event_type_id" ).attr('disabled', true );
+   cj( "#event_type_id" ).prop('disabled', true );
 
    window.location += '&template_id=' + tempId;
 }

diff --git a/templates/CRM/Event/Form/Participant.tpl b/templates/CRM/Event/Form/Participant.tpl
index ad53363caee8ba8e4d2f8f6bb8f90ebf70740b46..5a37446fda1f3a0be4822586b2a6e964297a80da 100644 (file)
--- a/templates/CRM/Event/Form/Participant.tpl
+++ b/templates/CRM/Event/Form/Participant.tpl
@@ -377,11 +377,11 @@
       });
 
       cj("#feeBlock").ajaxStart(function(){
-        cj(".disable-buttons input").attr('disabled', true);
+        cj(".disable-buttons input").prop('disabled', true);
       });
 
       cj("#feeBlock").ajaxStop(function(){
-        cj(".disable-buttons input").attr('disabled', false);
+        cj(".disable-buttons input").prop('disabled', false);
       });
 
       //show event real full as well as waiting list message.

diff --git a/templates/CRM/Financial/Form/BatchTransaction.tpl b/templates/CRM/Financial/Form/BatchTransaction.tpl
index be93fddce7b06e9d7cfb30cadc6bfbd2cac21df2..4f5ff95936485f7d14a886dc99a4dee40cacfe72 100644 (file)
--- a/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -133,8 +133,8 @@ cj( function() {
       return false;
     });
 
-    cj("#trans_assign").attr('disabled',true);
-    cj("#trans_remove").attr('disabled',true);
+    cj("#trans_assign").prop('disabled',true);
+    cj("#trans_remove").prop('disabled',true);
     cj('#crm-transaction-selector-assign #toggleSelect').click( function() {
       enableActions('x');
     });
@@ -190,10 +190,10 @@ cj( function() {
 
 function enableActions( type ) {
   if (type == 'x') {
-    cj("#trans_assign").attr('disabled',false);
+    cj("#trans_assign").prop('disabled',false);
   }
   else {
-    cj("#trans_remove").attr('disabled',false);
+    cj("#trans_remove").prop('disabled',false);
   }
 }
 

diff --git a/templates/CRM/Financial/Form/Search.tpl b/templates/CRM/Financial/Form/Search.tpl
index f785374c2ffa3bc38854592d97b5dd995388f19f..72028b6987ee66454c04840d7e5b90f805e69150 100644 (file)
--- a/templates/CRM/Financial/Form/Search.tpl
+++ b/templates/CRM/Financial/Form/Search.tpl
@@ -70,7 +70,7 @@
 cj(function($) {
   var batchSelector;
   buildBatchSelector();
-  $("#batch_update").removeAttr('disabled');
+  $("#batch_update").prop('disabled', false);
 
   $('#financial-search-form :input')
     .change(function() {

diff --git a/templates/CRM/Group/Form/Edit.tpl b/templates/CRM/Group/Form/Edit.tpl
index ed72d748c89407f721b6a04c5b4ce0ff14848e81..17879540755e6936d233a206825b92cc8d44d422 100644 (file)
--- a/templates/CRM/Group/Form/Edit.tpl
+++ b/templates/CRM/Group/Form/Edit.tpl
@@ -145,7 +145,7 @@
 {literal}
 <script type="text/javascript">
 {/literal}{if $freezeMailignList}{literal}
-cj('input[type=checkbox][name="group_type[{/literal}{$freezeMailignList}{literal}]"]').attr('disabled',true);
+cj('input[type=checkbox][name="group_type[{/literal}{$freezeMailignList}{literal}]"]').prop('disabled',true);
 {/literal}{/if}{literal}
 {/literal}{if $hideMailignList}{literal}
 cj('input[type=checkbox][name="group_type[{/literal}{$hideMailignList}{literal}]"]').hide();

diff --git a/templates/CRM/Member/Form/Task/Label.js b/templates/CRM/Member/Form/Task/Label.js
index 367ea240c988359ab00021d8a048f14dcbee3490..193614a362aa12446a5de44fcc7e22599ed391f3 100644 (file)
--- a/templates/CRM/Member/Form/Task/Label.js
+++ b/templates/CRM/Member/Form/Task/Label.js
@@ -2,14 +2,14 @@ cj(function ($) {
   'use strict';
   $('#per_membership').click(function() {
     if($(this).is(":checked")) {
-      $('#merge_same_address').attr('disabled', true);
-      $('#merge_same_household').attr('disabled', true);
+      $('#merge_same_address').prop('disabled', true);
+      $('#merge_same_household').prop('disabled', true);
       $('#merge_same_address').prop('checked', false);
       $('#merge_same_household').prop('checked', false);
     }
     else {
-      $('#merge_same_address').attr('disabled', false);
-      $('#merge_same_household').attr('disabled', false);
+      $('#merge_same_address').prop('disabled', false);
+      $('#merge_same_household').prop('disabled', false);
     }
   });
 

diff --git a/templates/CRM/Report/Form/Actions.tpl b/templates/CRM/Report/Form/Actions.tpl
index d4aa43f8a1416711b373868e26eca9326b251e4b..0254cf558f6d695ca91435639b6450744070ddc1 100644 (file)
--- a/templates/CRM/Report/Form/Actions.tpl
+++ b/templates/CRM/Report/Form/Actions.tpl
@@ -73,11 +73,11 @@
     var flashChartType = {/literal}{if $chartType}'{$chartType}'{else}''{/if}{literal};
     function disablePrintPDFButtons( viewtype ) {
       if (viewtype && flashChartType != viewtype) {
-        cj('#_qf_Summary_submit_pdf').attr('disabled', true).addClass('button-disabled');
-  cj('#_qf_Summary_submit_print').attr('disabled', true).addClass('button-disabled');
+        cj('#_qf_Summary_submit_pdf').prop('disabled', true).addClass('button-disabled');
+  cj('#_qf_Summary_submit_print').prop('disabled', true).addClass('button-disabled');
       } else {
-        cj('#_qf_Summary_submit_pdf').removeAttr('disabled').removeClass('button-disabled');
-  cj('#_qf_Summary_submit_print').removeAttr('disabled').removeClass('button-disabled');
+        cj('#_qf_Summary_submit_pdf').prop('disabled', false).removeClass('button-disabled');
+  cj('#_qf_Summary_submit_print').prop('disabled', false).removeClass('button-disabled');
       }
     }
     </script>

diff --git a/templates/CRM/Report/Form/Criteria.tpl b/templates/CRM/Report/Form/Criteria.tpl
index cfbd681aa872341f3596243063bd3fc7d266ec76..db132b78ef4361ad99ed7b6cbcbcbeff38689461 100644 (file)
--- a/templates/CRM/Report/Form/Criteria.tpl
+++ b/templates/CRM/Report/Form/Criteria.tpl
@@ -139,10 +139,10 @@
             
             function disPageBreak() {
               if (!cj(this).prop('checked')) {
-                cj(this).parent('td').next('td').children('input[id^="order_by_pagebreak_"]').attr({checked: false, disabled: "disabled"});
+                cj(this).parent('td').next('td').children('input[id^="order_by_pagebreak_"]').prop({checked: false, disabled: true});
               }
               else {
-                cj(this).parent('td').next('td').children('input[id^="order_by_pagebreak_"]').attr({disabled: false});
+                cj(this).parent('td').next('td').children('input[id^="order_by_pagebreak_"]').prop({disabled: false});
               }
             }
 

diff --git a/templates/CRM/Tag/Form/Tag.tpl b/templates/CRM/Tag/Form/Tag.tpl
index 3132cabb2e5947693df1b14b242564dedc065427..5da30144005bd3a1248806f197d598187d5186d9 100644 (file)
--- a/templates/CRM/Tag/Form/Tag.tpl
+++ b/templates/CRM/Tag/Form/Tag.tpl
@@ -60,7 +60,7 @@
       {/literal}
       {if $permission neq 'edit'}
         {literal}
-          $("#tagtree input").attr('disabled', true);
+          $("#tagtree input").prop('disabled', true);
         {/literal}
       {/if}
       {literal}

diff --git a/templates/CRM/common/customData.tpl b/templates/CRM/common/customData.tpl
index e203162dd8093906cb50d32255814542835fb37f..941003430c5f5871545e8dc97b00226a4cd141a8 100644 (file)
--- a/templates/CRM/common/customData.tpl
+++ b/templates/CRM/common/customData.tpl
@@ -108,8 +108,8 @@ CRM.buildCustomData = function( type, subType, subName, cgCount, groupID, isMult
           cj('textarea', this).each(function() {
             cj(this).text(cj(this).val());
           });
-          cj('option:selected', this).attr('selected', 'selected');
-          cj('option:not(:selected)', this).removeAttr('selected');
+          cj('option:selected', this).prop('selected', true);
+          cj('option:not(:selected)', this).prop('selected', false);
           storage[id] = cj(this).detach();
         }
       });