call render on file contents

CodeGrade · May 20, 2019 · dc2adbe · dc2adbe
1 parent 9de89af
commit dc2adbe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/app/assets/javascripts/exam.js b/app/assets/javascripts/exam.js
@@ -67,14 +67,12 @@ function activateCode(index, code) {
                 'Tab': "indentAuto"
             })
         });
-        if ($(code).data("contents")) {
-            const text = $(code).data("contents");
-            var markedText = extractMarks(text);
-            cm.setValue(markedText.text);
-            if (markedText.count > 0) applyMarks(cm, markedText.marks);
-            for (var i = 0; i < markedText.lines.length; i++)
-                cm.indentLine(i, "smart", true);
-        }
+        const text = $(code).text();
+        var markedText = extractMarks(text);
+        cm.setValue(markedText.text);
+        if (markedText.count > 0) applyMarks(cm, markedText.marks);
+        for (var i = 0; i < markedText.lines.length; i++)
+            cm.indentLine(i, "smart", true);
         cm.setCursor(0, 0);
         cm.clearHistory();
     }

diff --git a/app/views/exams/_files.html.erb b/app/views/exams/_files.html.erb
@@ -12,7 +12,9 @@
     <%
       contents = File.read(Rails.root.join("public", filename))
     %>
-    <textarea class="codemirror-textarea" data-lang="<%= lang %>" data-readonly="true" data-contents="<%= contents %>"></textarea>
+    <textarea class="codemirror-textarea" data-lang="<%= lang %>" data-readonly="true">
+      <%= render html: contents %>
+    </textarea>
   </div>
   <hr>
 <% end %>
diff --git a/app/views/exams/questiontypes/_code.html.erb b/app/views/exams/questiontypes/_code.html.erb
@@ -12,5 +12,7 @@
   end
 %>
 
-<%= form.text_area unique_label, label: "Respond with code in the following area.", class: "codemirror-textarea",
-                   data: {lang: lang, contents: contents, readonly: false} %>
+<p>Respond with code in the following area.</p>
+<textarea class="codemirror-textarea" data-lang="<%= lang %>" data-readonly="false" name="<%= unique_label %>">
+  <%= render html: contents %>
+</textarea>