fixed absolute values page

005.html

@@ -17,29 +17,27 @@ <h1>Equations with absolute values:By Omar Ochoa</h1><br>
   
   <form class="question">
     <div class = answerBox>
-      |<span class="q">
-        1-2
-      </span>|
+      <span class="q">|1-2|</span>
       = <input type="text" class="answer">
     </div>
     <input type="submit">
   </form>
   
   <form class="question">
     <div class = answerBox>
-      |<span class="q">
-        5*-5
-      </span>|
+      <span class="q">
+        |5*-5|
+      </span>
       = <input type="text" class="answer">
     </div/>
     <input type="submit">
   </form>
   
   <form class="question">
     <div class = answerBox>
-      |<span class="q">
-        -5+(-10*6)
-      </span>|
+      <span class="q">
+        |-5|+(-10*6)-|-5|
+      </span>
       = <input type="text" class="answer">
     </div>
     <input type="submit">
@@ -49,9 +47,9 @@ <h1>Equations with absolute values:By Omar Ochoa</h1><br>
   
   <form class="question">
     <div class = answerBox>
-      |<span class="q">
-        7-23
-      </span>|
+      <span class="q">
+        |7-23|
+      </span>
       = <input type="text" class="answer">
     </div>
     <input type="submit">
@@ -70,9 +68,9 @@ <h1>Equations with absolute values:By Omar Ochoa</h1><br>
  
   <form class="question">
     <div class = answerBox>
-      |<span class="q">
-        1+(-7*5)
-      </span>| = <input type="text" class="answer">
+      <span class="q">
+        1+|(-7*5)|
+      </span> = <input type="text" class="answer">
     </div>
     
     <div>
@@ -82,9 +80,9 @@ <h1>Equations with absolute values:By Omar Ochoa</h1><br>
   
   <form class="question">
     <div class = answerBox>
-      |<span class="q">
-        3*-4 + -2*5
-      </span>| = <input type="text" class="answer">
+      <span class="q">
+        |3*-4| + -2*5
+      </span> = <input type="text" class="answer">
     </div>
     
     <div>

005.js

@@ -1,3 +1,31 @@
+function solveAbsolutes(questionText){
+    console.log("Beginning to try to solve "+questionText);
+    var answer="";
+    var startAbs=false;
+
+    for(var i = 0; i < questionText.length; i++){
+        var letter = questionText[i];
+        console.log("Letter: "+letter);
+        if(letter!=="|"){
+            console.log("This letter is not a pipe.");
+            answer=answer+letter;
+        }else{
+            if(startAbs){
+                console.log("Ending absolute.");
+                answer=answer+")";
+                startAbs=false;
+            }else{
+                console.log("Beginning absolute.");
+                answer=answer+"Math.abs(";
+                startAbs=true;
+            }
+        }
+        console.log("Answer is currently: "+answer);
+    }
+
+    return eval(answer);
+}
+
 var questions = $('.question');
 
 function createQuestion (n) {
@@ -8,10 +36,11 @@ function createQuestion (n) {
         var theirAnswer = parseInt(qn.find('.answer').val());
         console.log("Their answer:" + theirAnswer);
         console.log("Right answer text"+ qn.find('.q').text());
-        var answerText = eval(qn.find('.q').text());
-        console.log("Right answer evaluated"+eval(qn.find('.q').text()));
-        console.log("Absdolute value of it is: "+Math.abs(answerText));
-        var rightAnswer = Math.abs(answerText);
+        var answerText = qn.find('.q').text();
+        console.log("Running our algorithm on: "+answerText);
+        var answer = solveAbsolutes(answerText);
+        console.log("Right answer evaluated"+answer);
+        var rightAnswer = answer;
         console.log("The right answer is: "+rightAnswer);
         if (theirAnswer === rightAnswer){
             qn.hide();