Merge pull request #1090 from autolab/highlight-lines-over-80

lines with over 80 chars are now highlighted
autolab · Feb 4, 2020 · 2a0b46c · 2a0b46c
2 parents e7a8f30 + e3adef4
commit 2a0b46c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/assets/javascripts/annotations.js b/app/assets/javascripts/annotations.js
@@ -292,17 +292,17 @@ function make_editable($editable) {
 
 /* Highlights lines longer than 80 characters autolab red color */
 var highlightLines = function(highlight) {
-  var highlightColor = "rgba(200, 200, 0, 0.9)"
-  $("#code-list > li > code").each(function() {
+  var highlightColor = "rgba(255, 255, 0, 0.3)"
+  $("#code-box > .code-table > .code-line > .code").each(function() {
     var text = $(this).text();
     // To account for lines that have 80 characters and a line break
     var diff = text[text.length - 1] === "\n" ? 1 : 0;
     if (text.length - diff > 80 && highlight) {
-      $(this).css("background-color", highlightColor);
-      $(this).prev().css("background-color", highlightColor);
+      $(this).css("background", highlightColor);
+      $(this).prev().css("background", highlightColor);
     } else {
-      $(this).css("background-color", "white");
-      $(this).prev().css("background-color", "white");
+      $(this).css("background", "inherit");
+      $(this).prev().css("background", "inherit");
     }
   });
 };
@@ -323,6 +323,8 @@ function displayAnnotations() {
 }
 
 function attachEvents() {
+  var status = $('#highlightLongLines')[0].checked;
+  highlightLines(status);
 
   $(".add-button").on("click", function(e) {
 

diff --git a/app/assets/stylesheets/annotations.css b/app/assets/stylesheets/annotations.css
@@ -513,6 +513,7 @@
   box-shadow: none;
   border: none;
   margin: 10px 0;
+  max-height: 350px;
 }
 
 .annotationSummary .collapsible-header{

diff --git a/app/views/submissions/_annotation_pane.html.erb b/app/views/submissions/_annotation_pane.html.erb
@@ -1,6 +1,4 @@
 <div id="annotationPane">
-  <%# TODO: Bring back highlight lines longer than 80 characters %>
-
   <div class="annotationSummary">
     <h1>Annotations</h1>
     <ul class="collapsible expandable">

diff --git a/app/views/submissions/view.html.erb b/app/views/submissions/view.html.erb
@@ -131,6 +131,8 @@
       </div>
     </div>
     <div class="col s8">
+        <input type="checkbox" id="highlightLongLines" checked>
+        <label for="highlightLongLines">Highlight lines longer than 80 characters</label>
       <%= render "code_viewer" %>
     </div>
     <div class="col s2">