# pdevine/khan-exercises forked from Khan/khan-exercises

Clean-up of conditional statements 1 to remove some unnecessary strings

1 parent 6999b83 commit 38eacafe9b9a944cc453ee211081e10c93bb9f57 Patrick Devine committed Apr 11, 2012
Showing with 16 additions and 15 deletions.
1. +16 −15 exercises/conditional_statements_1.html
 @@ -21,8 +21,8 @@ "Then you live in " + state( 1 ), "You live in " + state( 1 ), ], - "hypothesis" : "You live in " + city( 1 ), - "conclusion" : "You live in " + state( 1 ), + "hypothesis" : 1, + "conclusion" : 3, }, "lineTypes" : { "statements" : [ @@ -35,8 +35,8 @@ "Then they " + lineProperty( 1 ), "They " + lineProperty( 1 ), ], - "hypothesis" : "Two lines are " + lineType( 1 ), - "conclusion" : "They " + lineProperty( 1 ), + "hypothesis" : 1, + "conclusion" : 3, }, "evenOdd" : { "statements" : [ @@ -49,8 +49,8 @@ "Then the number is " + EVEN_ODD[1], "The number is " + EVEN_ODD[1], ], - "hypothesis" : "A number divisible by " + EVEN_ODD[0], - "conclusion" : "The number is " + EVEN_ODD[1], + "hypothesis" : 1, + "conclusion" : 3, }, "exercises" : { "statements" : [ @@ -63,8 +63,8 @@ "Then you will raise your heart rate", "You will raise your heart rate", ], - "hypothesis" : "You do " + plural(exercise( 1 )) + " for ten minutes", - "conclusion" : "You will raise your heart rate", + "hypothesis" : 1, + "conclusion" : 3, }, "sportingEvents" : { "statements" : [ @@ -77,16 +77,17 @@ "Then we will be ready for the " + sport( 1 ) + " game", "We will be ready for the " + sport( 1 ) + " game", ], - "hypothesis" : "We have a good practice", - "conclusion" : "We will be ready for the " + sport( 1 ) + " game", + "hypothesis" : 1, + "conclusion" : 3, }, } - randFromArray(["cityStates", "lineTypes", "evenOdd", "exercises", "sportingEvents"]) - randFromArray(PROBLEM_DATA[PROBLEM_TYPE]["statements"]) - shuffle(PROBLEM_DATA[PROBLEM_TYPE]["choices"]) - randFromArray([ "hypothesis", "conclusion" ]) - CHOICES[jQuery.inArray( PROBLEM_DATA[PROBLEM_TYPE][SOLUTION_TYPE], CHOICES)] + randFromArray( ["cityStates", "lineTypes", "evenOdd", "exercises", "sportingEvents"] ) + randFromArray( PROBLEM_DATA[PROBLEM_TYPE]["statements"] ) + shuffle( PROBLEM_DATA[PROBLEM_TYPE]["choices"] ) + randFromArray( ["hypothesis", "conclusion"] ) + PROBLEM_DATA[PROBLEM_TYPE][SOLUTION_TYPE] + CHOICES[jQuery.inArray( PROBLEM_DATA[PROBLEM_TYPE]["choices"][SOLUTION_IDX], CHOICES )]