From dd446f12e7539d7e7acc295f96a6b90b4d2c2902 Mon Sep 17 00:00:00 2001
From: Brett Smith <brett@curoverse.com>
Date: Wed, 26 Nov 2014 11:34:53 -0500
Subject: [PATCH] 4291: Workbench uses .prop() to set element disabled
property.
Per <http://api.jquery.com/prop/>: "The .prop() method should be used
to set disabled and checked instead of the .attr() method."
---
apps/workbench/app/assets/javascripts/report_issue.js | 4 ++--
.../app/views/application/report_issue_popup.js.erb | 8 ++------
apps/workbench/app/views/users/setup_popup.js.erb | 6 +++---
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/apps/workbench/app/assets/javascripts/report_issue.js b/apps/workbench/app/assets/javascripts/report_issue.js
index e769d80957..f3c323c63b 100644
--- a/apps/workbench/app/assets/javascripts/report_issue.js
+++ b/apps/workbench/app/assets/javascripts/report_issue.js
@@ -1,7 +1,7 @@
$(document).
on('click', "#report-issue-submit", function(e){
$(this).html('Sending');
- $(this).attr('disabled', true);
+ $(this).prop('disabled', true);
var $cancelButton = $('#report-issue-cancel');
if ($cancelButton) {
$cancelButton.html('Close');
@@ -21,7 +21,7 @@ $(document).
$('div').remove('.modal-footer-status');
$('.modal-footer').append('<div><br/></div><div class="modal-footer-status alert alert-danger"><p class="contain-align-left">We are sorry. We could not submit your report! We really want this to work, though -- please try again.</p></div>');
$sendButton.html('Send problem report');
- $sendButton.attr('disabled',false);
+ $sendButton.prop('disabled', false);
}
var $cancelButton = $('#report-issue-cancel');
$cancelButton.html('Cancel');
diff --git a/apps/workbench/app/views/application/report_issue_popup.js.erb b/apps/workbench/app/views/application/report_issue_popup.js.erb
index 6795c091fc..73830ee049 100644
--- a/apps/workbench/app/views/application/report_issue_popup.js.erb
+++ b/apps/workbench/app/views/application/report_issue_popup.js.erb
@@ -3,14 +3,10 @@ $("#report-issue-modal-window .modal").modal('show');
// Disable the submit button on modal loading
$submit = $('#report-issue-submit');
-$submit.attr('disabled', true);
+$submit.prop('disabled', true);
// capture events to enable submit button when applicable
$('#report_issue_text').bind('input propertychange', function() {
var problem_desc = document.forms["report-issue-form"]["report_issue_text"].value;
- if (problem_desc === null || problem_desc === "") {
- $submit.attr('disabled', true)
- } else {
- $submit.removeAttr('disabled');
- }
+ $submit.prop('disabled', (problem_desc === null) || (problem_desc === ""));
});
diff --git a/apps/workbench/app/views/users/setup_popup.js.erb b/apps/workbench/app/views/users/setup_popup.js.erb
index 5671cc2d9c..b1aa796cd1 100644
--- a/apps/workbench/app/views/users/setup_popup.js.erb
+++ b/apps/workbench/app/views/users/setup_popup.js.erb
@@ -9,7 +9,7 @@ var email_value = document.forms["setup_form"]["email"].value;
var prefix_value = document.forms["setup_form"]["openid_prefix"].value;
if ((email_disabled == false) && (email_value == null || email_value == "" ||
prefix_value == null || prefix_value == "")) {
- $register.attr('disabled', true);
+ $register.prop('disabled', true);
}
// capture events to enable submit button when applicable
@@ -22,7 +22,7 @@ $input.on('keyup paste mouseleave', function() {
var emailRegExp = /^([\w-\.]+@([\w-]+\.)+[\w-]{2,4})?$/;
var validEmail = false;
-
+
if (emailRegExp.test(email_value )) {
validEmail = true;
}
@@ -32,7 +32,7 @@ $input.on('keyup paste mouseleave', function() {
trigger = true;
}
- trigger ? $register.attr('disabled', true) : $register.removeAttr('disabled');
+ $register.prop('disabled', trigger);
});
// reset form input fields, for the next time around
--
2.30.2