tweaks

Philip Guo · Philip Guo · commit f63b0896a2b8 · 2011-10-01T23:59:13.000-04:00
diff --git a/edu-python-questions.js b/edu-python-questions.js
@@ -150,8 +150,8 @@ $(document).ready(function() {
 
 // concatenate solution code and test code:
 function concatSolnTestCode(solnCode, testCode) {
-  var filler = (solnCode[solnCode.length - 1] != '\n') ? '\n' : '';
-  return solnCode + filler + "\n# Everything below here is test code\n" + testCode;
+  // use rtrim to get rid of trailing whitespace and newlines
+  return solnCode.rtrim() + "\n\n# Everything below here is test code\n" + testCode;
 }
 
 
@@ -252,7 +252,9 @@ function finishQuestionsInit(questionsDat) {
       var numChangedLines = 0;
 
       // split on newlines to do a line-level diff
-      var diffResults = diff($("#actualCodeInput").val().split(/\n/), questionsDat.skeleton.split(/\n/));
+      // (rtrim both strings to discount the effect of trailing
+      // whitespace and newlines)
+      var diffResults = diff($("#actualCodeInput").val().rtrim().split(/\n/), questionsDat.skeleton.rtrim().split(/\n/));
       //console.log(diffResults);
       $.each(diffResults, function(i, e) {
         if (e.file1 && e.file2) {
diff --git a/edu-python.css b/edu-python.css
@@ -175,6 +175,7 @@ table#pyCodeOutput .cod {
 div#editCodeLinkDiv {
   text-align: center;
   margin-top: 8px;
+  margin-bottom: 4px;
 }
 
 #editCodeLinkOnError {
@@ -205,7 +206,7 @@ button.medBtn {
 
 #vcrControls {
   margin-top: 10px;
-  margin-bottom: 20px;
+  margin-bottom: 15px;
 }
 
 #vcrControls button {
diff --git a/questions/buggy-mergesort.txt b/questions/buggy-mergesort.txt
@@ -3,7 +3,7 @@ Debug: Mergesort
 
 Question:
 
-Add at most TWO LINES of code to make the given mergesort function work
+Add at most TWO lines of code to make the given mergesort function work
 properly.
 
 Hint:
diff --git a/questions/inplace-reverse.txt b/questions/inplace-reverse.txt
@@ -4,7 +4,8 @@ Debug: In-place reverse
 Question:
 
 The given function reverses a list in-place, but it doesn't work for all
-test inputs.  Change only ONE line to make this function pass all tests.
+test inputs.  Change only ONE line of code to make this function pass
+all tests.
 
 MaxLineDelta: 1
 

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,7 @@ table#pyCodeOutput .cod {`
`175`	`175`	`div#editCodeLinkDiv {`
`176`	`176`	`text-align: center;`
`177`	`177`	`margin-top: 8px;`
	`178`	`+ margin-bottom: 4px;`
`178`	`179`	`}`
`179`	`180`
`180`	`181`	`#editCodeLinkOnError {`
`@@ -205,7 +206,7 @@ button.medBtn {`
`205`	`206`
`206`	`207`	`#vcrControls {`
`207`	`208`	`margin-top: 10px;`
`208`		`- margin-bottom: 20px;`
	`209`	`+ margin-bottom: 15px;`
`209`	`210`	`}`
`210`	`211`
`211`	`212`	`#vcrControls button {`