3714: minor updates from review feedback

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 a1306653bffe36b107bac15c14ed6fcd4a8e5afc..6795c091fc332a3007e0c575e2f6fc42d2916aa2 100644 (file)
--- a/apps/workbench/app/views/application/report_issue_popup.js.erb
+++ b/apps/workbench/app/views/application/report_issue_popup.js.erb
@@ -1,21 +1,16 @@
 $("#report-issue-modal-window").html("<%= escape_javascript(render partial: 'report_issue_popup') %>");
 $("#report-issue-modal-window .modal").modal('show');
 
-// Disable the submit button until the problem description is entered
+// Disable the submit button on modal loading
 $submit = $('#report-issue-submit');
-
-var problem_desc = document.forms["report-issue-form"]["report_issue_text"].value;
-if (problem_desc == null || problem_desc == "") {
-  $submit.attr('disabled', true);
-}
+$submit.attr('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;
-
-  var trigger = false;
-  if (problem_desc == null || problem_desc == "") {
-    trigger = true;
+  if (problem_desc === null || problem_desc === "") {
+    $submit.attr('disabled', true)
+  } else {
+    $submit.removeAttr('disabled');
   }
-  trigger ? $submit.attr('disabled', true) : $submit.removeAttr('disabled');
 });

diff --git a/apps/workbench/test/integration/report_issue_test.rb b/apps/workbench/test/integration/report_issue_test.rb
index ebedce310cd945c79f431cee98a45078a64eeec1..4bf7d5747828a92f19130b5f9b1847b25a48a0f8 100644 (file)
--- a/apps/workbench/test/integration/report_issue_test.rb
+++ b/apps/workbench/test/integration/report_issue_test.rb
@@ -59,7 +59,7 @@ class ReportIssueTest < ActionDispatch::IntegrationTest
 
       # enter a report text and click on report
       page.find_field('report_issue_text').set 'my test report text'
-        assert page.has_button?('Send problem report'), 'Send problem report button not enabled after entering text'
+      assert page.has_button?('Send problem report'), 'Send problem report button not enabled after entering text'
       click_button 'Send problem report'
 
       # ajax success updated button texts and added footer message