diff --git a/js/select-admin.js b/js/select-admin.js
index a9830af..f6cfcdd 100644
--- a/js/select-admin.js
+++ b/js/select-admin.js
@@ -44,11 +44,13 @@ Drupal.webform.selectOptionsLoad = function(result) {
     }
   }
   else {
+    var $element = $('#' + result.elementId);
     if (result.options) {
-      $('#' + result.elementId).val(result.options).attr('readonly', 'readonly');
+      $element.val(result.options);
+      $.fn.prop ? $element.prop('readonly', true) : $element.attr('readonly', 'readonly');
     }
     else {
-      $('#' + result.elementId).removeAttr('readonly');
+      $.fn.prop ? $element.prop('readonly', false) : $element.removeAttr('readonly');
     }
   }
 }
diff --git a/js/webform-admin.js b/js/webform-admin.js
index 944954a..34469d6 100644
--- a/js/webform-admin.js
+++ b/js/webform-admin.js
@@ -25,12 +25,14 @@ Drupal.webform = Drupal.webform || {};
 Drupal.webform.setActive = function(context) {
   var setActiveOnChange = function(e) {
     if ($(this).val()) {
-      $(this).closest('.form-type-radio').find('input[type=radio]').attr('checked', true);
+      var $checkbox = $(this).closest('.form-type-radio').find('input[type=radio]');
+      $.fn.prop ? $checkbox.prop('checked', true) : $checkbox.attr('checked', true);
     }
     e.preventDefault();
   };
   var setActiveOnClick = function(e) {
-    $(this).closest('.form-type-radio').find('input[type=radio]').attr('checked', true);
+    var $checkbox = $(this).closest('.form-type-radio').find('input[type=radio]');
+    $.fn.prop ? $checkbox.prop('checked', true) : $checkbox.attr('checked', true);
   };
   $('.webform-inline-radio', context).click(setActiveOnClick);
   $('.webform-set-active', context).change(setActiveOnChange);
@@ -91,6 +93,7 @@ Drupal.webform.tableSelectIndentation = function(context) {
   var $tables = $('th.select-all', context).parents('table');
   $tables.find('input.form-checkbox').change(function() {
     var $rows = $(this).parents('table:first').find('tr');
+    var $checkbox;
     var row = $(this).parents('tr:first').get(0);
     var rowNumber = $rows.index(row);
     var rowTotal = $rows.size();
@@ -99,7 +102,8 @@ Drupal.webform.tableSelectIndentation = function(context) {
       if ($rows.eq(n).find('div.indentation').size() <= indentLevel) {
         break;
       }
-      $rows.eq(n).find('input.form-checkbox').attr('checked', this.checked);
+      $checkbox = $rows.eq(n).find('input.form-checkbox');
+      $.fn.prop ? $checkbox.prop('checked', this.checked) : $checkbox.attr('checked', this.checked);
     }
   });
 }
diff --git a/js/webform.js b/js/webform.js
index 2b5cef2..e382ff6 100644
--- a/js/webform.js
+++ b/js/webform.js
@@ -156,13 +156,18 @@ Drupal.webform.conditionalCheck = function(e) {
         showComponent = conditionalResult;
       }
 
+      var $target = $form.find('.' + ruleGroup['target']);
+      var $targetElements;
       if (showComponent) {
-        $form.find('.' + ruleGroup['target']).find('.webform-conditional-disabled').removeAttr('disabled').removeClass('webform-conditional-disabled').end().show();
+        $targetElements = $target.find('.webform-conditional-disabled').removeClass('webform-conditional-disabled');
+        $.fn.prop ? $targetElements.prop('disabled', false) : $targetElements.removeAttr('disabled');
+        $target.show();
       }
       else {
-        $form.find('.' + ruleGroup['target']).find(':input').attr('disabled', true).addClass('webform-conditional-disabled').end().hide();
+        $targetElements = $target.find(':input').addClass('webform-conditional-disabled');
+        $.fn.prop ? $targetElements.prop('disabled', true) : $targetElements.attr('disabled', true);
+        $target.hide();
       }
-
     });
   }