Permalink
Browse files

Use integer data forms on All the Exercises!

Summary:
Okay, not all of them. But a lot of them.

Use number field on Changing Decimals to Percents.

Use integer data form for Converting Between Point Slope and Slope Intercept.

Use type=number fields on Converting Between Point Slope and Standard Form.

Use integer data form in Domain and Range of a Function 0.5.

Use integer data form in EQuation of a Circle 1, 2

Use integer data form on Equation of an Ellipse.

Use integer, decimal data forms for Inscribed Angles 1, 2, 3

Use integer data form on Matrix Addition and Subtraction.

Use integer data forms for Matrix Dimensions.

Use integer data forms on Matrix Transpose.

Use integer data forms for Measuring Angles.

Use integer data form on Multiplying a Matrix by a Matrix.

Use integer data form on Multiplying a Matrix by a Vector.

Use integer, decimal data forms on Multiplying and Dividing Scientific Notation.

Use integer, decimal data forms on Multiplying Complex Numbers.

Use integer data form in One Step Equations.

Use integer data form in Perimeter 1.

Use integer data form in Perimeter of Squares and Rectangles.

Use integer data form in Pile Patterns.

Use integer, decimal data forms in Plugging in Values.

Use integer data form for Quadrilateral Angles.

Use integer and decimal data forms for Range of a Function.

Use integer data form for Reading Bar Charts 1.

Use integer, decimal data forms for Reading Line Charts 1.

Allow decimal data form for Reading Pictograms 2.

Use integer data form for Reading Tables 1,2.

Use integer, decimal data forms on Scientific Notation.

Use integer data form in Simplifying Expressions with Exponents.

Use integer data form in Solid Geometry.

Use integer, decimal data forms with Square Roots.

Use integer data form with Square Roots 2.

Use integer data forms with Scalar Matrix Multiplication.

Use integer data form on Telling Time 0.5

Test Plan: locally

Reviewers: tom, eater, stephanie

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D1048
  • Loading branch information...
1 parent 83ab06d commit eaa5f38fe2373fc2f1a892f2bfbaef5e2f88092f @cbhl cbhl committed Jan 21, 2013
Showing with 101 additions and 85 deletions.
  1. +1 −1 exercises/changing_decimals_to_percents.html
  2. +1 −1 exercises/converting_between_point_slope_and_slope_intercept.html
  3. +1 −1 exercises/converting_between_point_slope_and_standard_form.html
  4. +3 −2 exercises/domain_and_range_0.5.html
  5. +4 −3 exercises/equation_of_a_circle_1.html
  6. +4 −3 exercises/equation_of_a_circle_2.html
  7. +5 −4 exercises/equation_of_an_ellipse.html
  8. +2 −2 exercises/inscribed_angles_1.html
  9. +2 −2 exercises/inscribed_angles_2.html
  10. +2 −2 exercises/inscribed_angles_3.html
  11. +1 −1 exercises/matrix_addition_and_subtraction.html
  12. +4 −3 exercises/matrix_dimensions.html
  13. +4 −3 exercises/matrix_dimensions_alternative.html
  14. +1 −1 exercises/matrix_transpose.html
  15. +1 −1 exercises/measuring_angles.html
  16. +1 −1 exercises/multiplying_a_matrix_by_a_matrix.html
  17. +1 −1 exercises/multiplying_a_matrix_by_a_matrix_solution_only.html
  18. +1 −1 exercises/multiplying_a_matrix_by_a_matrix_steps_only.html
  19. +1 −1 exercises/multiplying_a_matrix_by_a_matrix_video_hint.html
  20. +1 −1 exercises/multiplying_a_matrix_by_a_vector.html
  21. +6 −5 exercises/multiplying_and_dividing_scientific_notation.html
  22. +4 −3 exercises/multiplying_complex_numbers.html
  23. +1 −1 exercises/one_step_equations.html
  24. +5 −5 exercises/perimeter_1.html
  25. +3 −3 exercises/perimeter_of_squares_and_rectangles.html
  26. +4 −3 exercises/pile_patterns.html
  27. +1 −1 exercises/plugging_in_values.html
  28. +1 −1 exercises/quadrilateral_angles.html
  29. +1 −1 exercises/range_of_a_function.html
  30. +1 −1 exercises/reading_bar_charts_1.html
  31. +1 −1 exercises/reading_line_charts_1.html
  32. +3 −3 exercises/reading_pictographs_2.html
  33. +1 −1 exercises/reading_tables_1.html
  34. +1 −1 exercises/reading_tables_2.html
  35. +1 −1 exercises/scalar_matrix_multiplication.html
  36. +8 −2 exercises/scientific_notation.html
  37. +5 −4 exercises/simplifying_expressions_with_exponents.html
  38. +2 −2 exercises/solid_geometry.html
  39. +1 −1 exercises/square_roots.html
  40. +1 −1 exercises/square_roots_2.html
  41. +1 −1 exercises/telling_time_0.5.html
  42. +2 −2 exercises/translations_of_points_and_polygons.html
  43. +4 −4 exercises/triangle_angles_1.html
  44. +1 −1 exercises/triangle_inequality_theorem.html
  45. +1 −1 exercises/vertex_of_a_parabola.html
View
2 exercises/changing_decimals_to_percents.html
@@ -15,7 +15,7 @@
<div id="original" data-weight="1">
<p class="question">Express <code><var>DECIMAL</var></code> as a percent.</p>
<div class="solution" data-type="multiple">
- <p><span class="sol"><var>SOLN</var></span> %</p>
+ <p><span class="sol" data-forms="decimal"><var>SOLN</var></span> %</p>
</div>
<div class="hints">
View
2 exercises/converting_between_point_slope_and_slope_intercept.html
@@ -25,7 +25,7 @@
<p>In other words, if the equation is rewritten to look like <code>y = mx + b</code>, what are the values of <code>m</code> and <code>b</code>?</p>
<p><code>y - <var>y1</var> = <var>m</var>(x - <var>x1</var>)</code></p>
<div class="solution" data-type="multiple">
- <p><code>y = \space</code><span class="sol"><var>m</var></span><code>\space \cdot x + \space</code><span class="sol"><var>b</var></span></p>
+ <p><code>y = \space</code><span class="sol" data-forms="integer"><var>m</var></span><code>\space \cdot x + \space</code><span class="sol" data-forms="integer"><var>b</var></span></p>
</div>
<div class="hints">
<div>
View
2 exercises/converting_between_point_slope_and_standard_form.html
@@ -32,7 +32,7 @@
<!-- Custom validation is used to allow for x to be any value. If we allowed a finite range for x, then we could have a set of solutions.-->
<div class="solution" data-type="custom">
<div class="instruction">
- <p><code>y - {}</code><input id="solution_y" type="text"></input><code>{} = {}</code><input id="solution_m" type="text"></input><code>(x - {}</code><input id="solution_x" type="text"></input><code>)</code></p>
+ <p><code>y - {}</code><input id="solution_y" type="number"></input><code>{} = {}</code><input id="solution_m" type="number"></input><code>(x - {}</code><input id="solution_x" type="number"></input><code>)</code></p>
</div>
<div class="guess">
[ $( '#solution_x' ).val(), $( '#solution_y' ).val(), $( '#solution_m' ).val() ]
View
5 exercises/domain_and_range_0.5.html
@@ -5,7 +5,8 @@
<title>Domain and range of a function 0.5</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
- #answer_area input[type=text] {
+ #answer_area input[type=text],
+ #answer_area input[type=number] {
width: 40px;
}
</style>
@@ -75,7 +76,7 @@
circle( FUNCTION_PATH[ FUNCTION_PATH.length - 1], 0.15, { stroke: "none", fill: BLUE } );
</div>
- <p class="solution" data-type="multiple"><span class="sol"><var>DOMAIN[0]</var></span><code>\;\le x\le\;</code><span class="sol"><var>DOMAIN[1]</var></span></p>
+ <p class="solution" data-type="multiple"><span class="sol" data-forms="integer"><var>DOMAIN[0]</var></span><code>\;\le x\le\;</code><span class="sol" data-forms="integer"><var>DOMAIN[1]</var></span></p>
<div class="hints">
<p>For what values of <code>x</code> does <code>f(x)</code> have a value?</p>
View
7 exercises/equation_of_a_circle_1.html
@@ -5,7 +5,8 @@
<title>Equation of a circle 1</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
- #answer_area .short input[type=text] {
+ #answer_area .short input[type=text],
+ #answer_area .short input[type=number] {
width: 40px;
}
</style>
@@ -31,8 +32,8 @@
</div>
<div class="solution" data-type="multiple">
- <p class="short"><code>(h, k) = (</code><span class="sol"><var>H</var></span><code>,</code> <span class="sol"><var>K</var></span><code>)</code></p>
- <p><code>r</code> = <span class="sol"><var>R</var></span></p>
+ <p class="short"><code>(h, k) = (</code><span class="sol" data-forms="integer"><var>H</var></span><code>,</code> <span class="sol" data-forms="integer"><var>K</var></span><code>)</code></p>
+ <p><code>r</code> = <span class="sol" data-forms="integer"><var>R</var></span></p>
</div>
</div>
</div>
View
7 exercises/equation_of_a_circle_2.html
@@ -5,7 +5,8 @@
<title>Equation of a circle 2</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
- #answer_area .short input[type=text] {
+ #answer_area .short input[type=text],
+ #answer_area .short input[type=number] {
width: 40px;
}
</style>
@@ -42,8 +43,8 @@
</div>
<div class="solution" data-type="multiple">
- <p class="short"><code>(h, k) = (</code><span class="sol"><var>H</var></span><code>,</code> <span class="sol"><var>K</var></span><code>)</code></p>
- <p><code>r</code> = <span class="sol"><var>R</var></span></p>
+ <p class="short"><code>(h, k) = (</code><span class="sol" data-forms="integer"><var>H</var></span><code>,</code> <span class="sol" data-forms="integer"><var>K</var></span><code>)</code></p>
+ <p><code>r</code> = <span class="sol" data-forms="integer"><var>R</var></span></p>
</div>
</div>
</div>
View
9 exercises/equation_of_an_ellipse.html
@@ -5,7 +5,8 @@
<title>Equation of an ellipse</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
- #answer_area .short input[type=text] {
+ #answer_area .short input[type=text],
+ #answer_area .short input[type=number] {
width: 40px;
}
</style>
@@ -36,9 +37,9 @@
</div>
<div class="solution" data-type="multiple">
- <p class="short"><code>(h, k) = (</code><span class="sol"><var>H</var></span><code>,</code> <span class="sol"><var>K</var></span><code>)</code></p>
- <p>Major radius = <span class="sol short"><var>MAJ</var></span></p>
- <p>Minor radius = <span class="sol short"><var>MIN</var></span></p>
+ <p class="short"><code>(h, k) = (</code><span class="sol" data-forms="integer"><var>H</var></span><code>,</code> <span class="sol" data-forms="integer"><var>K</var></span><code>)</code></p>
+ <p>Major radius = <span class="sol short" data-forms="integer"><var>MAJ</var></span></p>
+ <p>Minor radius = <span class="sol short" data-forms="integer"><var>MIN</var></span></p>
</div>
</div>
</div>
View
4 exercises/inscribed_angles_1.html
@@ -41,7 +41,7 @@
graph.circle.drawMovablePoint( SUBTENDED_POINT, START + CENTRAL, START );
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>CENTRAL / 2</var></span> degrees
+ <span class="sol" data-forms="integer, decimal"><var>CENTRAL / 2</var></span> degrees
</div>
<div class="hints">
<div>
@@ -85,7 +85,7 @@
<var id="ASKED_LABEL">"blue"</var>
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>CENTRAL</var></span> degrees
+ <span class="sol" data-forms="integer, decimal"><var>CENTRAL</var></span> degrees
</div>
<div class="hints">
View
4 exercises/inscribed_angles_2.html
@@ -41,7 +41,7 @@
graph.circle.drawMovablePoint( SUBTENDED_POINT, START + CENTRAL, START );
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>CENTRAL / 2</var></span> degrees
+ <span class="sol" data-forms="integer, decimal"><var>CENTRAL / 2</var></span> degrees
</div>
<div class="hints">
<div>
@@ -96,7 +96,7 @@
<var id="ASKED_LABEL">"blue"</var>
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>CENTRAL</var></span> degrees
+ <span class="sol" data-forms="integer, decimal"><var>CENTRAL</var></span> degrees
</div>
<div class="hints">
View
4 exercises/inscribed_angles_3.html
@@ -63,7 +63,7 @@
graph.circle.drawMovablePoint( SUBTENDED_POINT, START + CENTRAL, START );
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>CENTRAL / 2</var></span> degrees
+ <span class="sol" data-forms="integer, decimal"><var>CENTRAL / 2</var></span> degrees
</div>
<div class="hints">
<div>
@@ -144,7 +144,7 @@
<var id="ASKED_LABEL">"blue"</var>
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>CENTRAL</var></span> degrees
+ <span class="sol" data-forms="integer, decimal"><var>CENTRAL</var></span> degrees
</div>
<div class="hints">
<div>
View
2 exercises/matrix_addition_and_subtraction.html
@@ -79,7 +79,7 @@
<div class="solution" data-type="multiple">
<div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
<span data-each="row as elem">
- <span data-if="elem !== ''" class="sol">
+ <span data-if="elem !== ''" class="sol" data-forms="integer">
<var>elem</var>
</span>
<span data-else data-type="text" class="sol">
View
7 exercises/matrix_dimensions.html
@@ -5,7 +5,8 @@
<title>Matrix dimensions</title>
<script src="../khan-exercise.js"></script>
<style>
- #answer_area .sol input[type=text] {
+ #answer_area .sol input[type=text],
+ #answer_area .sol input[type=number] {
width: 20px;
}
</style>
@@ -35,9 +36,9 @@
</p>
<div class="solution" data-type="multiple">
- <span class="sol"><var>DIM_1</var></span>
+ <span class="sol" data-forms="integer"><var>DIM_1</var></span>
<code>\times</code>
- <span class="sol"><var>DIM_2</var></span>
+ <span class="sol" data-forms="integer"><var>DIM_2</var></span>
</div>
</div>
</div>
View
7 exercises/matrix_dimensions_alternative.html
@@ -5,7 +5,8 @@
<title>Matrix dimensions</title>
<script src="../khan-exercise.js"></script>
<style>
- #answer_area .sol input[type=text] {
+ #answer_area .sol input[type=text],
+ #answer_area .sol input[type=number] {
width: 20px;
}
</style>
@@ -35,9 +36,9 @@
</p>
<div class="solution" data-type="multiple">
- <span class="sol"><var>DIM_1</var></span>
+ <span class="sol" data-forms="integer"><var>DIM_1</var></span>
<code>\times</code>
- <span class="sol"><var>DIM_2</var></span>
+ <span class="sol" data-forms="integer"><var>DIM_2</var></span>
</div>
</div>
</div>
View
2 exercises/matrix_transpose.html
@@ -35,7 +35,7 @@
<div class="solution" data-type="multiple">
<div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
<span data-each="row as elem">
- <span data-if="elem !== ''" class="sol">
+ <span data-if="elem !== ''" class="sol" data-forms="integer">
<var>elem</var>
</span>
<span data-else data-type="text" class="sol">
View
2 exercises/measuring_angles.html
@@ -34,7 +34,7 @@
</div>
</div>
<div class="solution" data-type="multiple">
- <span class="sol" data-type="rational" data-inexact data-max-error="5"><var>DIFF</var></span><code>{}^{\circ}</code>
+ <span class="sol" data-forms="integer" data-inexact data-max-error="5"><var>DIFF</var></span><code>{}^{\circ}</code>
</div>
</div>
</div>
View
2 exercises/multiplying_a_matrix_by_a_matrix.html
@@ -134,7 +134,7 @@
<div class="solution" data-type="multiple">
<div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
<span data-each="row as elem">
- <span data-if="elem !== ''" class="sol">
+ <span data-if="elem !== ''" class="sol" data-forms="integer">
<var>elem</var>
</span>
<span data-else data-type="text" class="sol">
View
2 exercises/multiplying_a_matrix_by_a_matrix_solution_only.html
@@ -58,7 +58,7 @@
<div class="solution" data-type="multiple">
<div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
<span data-each="row as elem">
- <span data-if="elem !== ''" class="sol">
+ <span data-if="elem !== ''" class="sol" data-forms="integer">
<var>elem</var>
</span>
<span data-else data-type="text" class="sol">
View
2 exercises/multiplying_a_matrix_by_a_matrix_steps_only.html
@@ -118,7 +118,7 @@
<div class="solution" data-type="multiple">
<div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
<span data-each="row as elem">
- <span data-if="elem !== ''" class="sol">
+ <span data-if="elem !== ''" class="sol" data-forms="integer">
<var>elem</var>
</span>
<span data-else data-type="text" class="sol">
View
2 exercises/multiplying_a_matrix_by_a_matrix_video_hint.html
@@ -61,7 +61,7 @@
<div class="solution" data-type="multiple">
<div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
<span data-each="row as elem">
- <span data-if="elem !== ''" class="sol">
+ <span data-if="elem !== ''" class="sol" data-forms="integer">
<var>elem</var>
</span>
<span data-else data-type="text" class="sol">
View
2 exercises/multiplying_a_matrix_by_a_vector.html
@@ -121,7 +121,7 @@
<div class="solution" data-type="multiple">
<div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
<span data-each="row as elem">
- <span data-if="elem !== ''" class="sol">
+ <span data-if="elem !== ''" class="sol" data-forms="integer">
<var>elem</var>
</span>
<span data-else data-type="text" class="sol">
View
11 exercises/multiplying_and_dividing_scientific_notation.html
@@ -5,7 +5,8 @@
<title>Multiplying and dividing scientific notation</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
- #answer_area input[type=text] {
+ #answer_area input[type=text],
+ #answer_area input[type=number] {
width: 30px;
}
</style>
@@ -27,9 +28,9 @@
</p>
<div class="solution" data-type="multiple">
- <span class="sol base"><var>scientificMantissa( 2, QUOTIENT )</var></span>
+ <span class="sol base" data-forms="integer, decimal"><var>scientificMantissa( 2, QUOTIENT )</var></span>
<code> \times 10 </code>
- <sup class="sol exp" style="width: 20px;"><var>scientificExponent( QUOTIENT )</var></sup>
+ <sup class="sol exp" data-forms="integer, decimal" style="width: 20px;"><var>scientificExponent( QUOTIENT )</var></sup>
</div>
<div class="hints">
@@ -74,9 +75,9 @@
<code>(<var>scientific( 2, QUOTIENT )</var>)\times (<var>scientific( 2, DENOMINATOR )</var>)</code></p>
<div class="solution" data-type="multiple">
- <span class="sol base"><var>scientificMantissa( 3, NUMERATOR )</var></span>
+ <span class="sol base" data-forms="integer, decimal"><var>scientificMantissa( 3, NUMERATOR )</var></span>
<code> \times 10 </code>
- <sup class="sol exp" style="width: 20px;"><var>scientificExponent( NUMERATOR )</var></sup>
+ <sup class="sol exp" data-forms="integer, decimal" style="width: 20px;"><var>scientificExponent( NUMERATOR )</var></sup>
</div>
<div class="hints">
View
7 exercises/multiplying_complex_numbers.html
@@ -5,7 +5,8 @@
<title>Multiplying complex numbers</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
- #solutionarea input[type="text"] {
+ #solutionarea input[type="text"],
+ #solutionarea input[type="number"] {
width: 50px
}
</style>
@@ -40,11 +41,11 @@
<p class="question">Multiply the following complex numbers:</p>
<p><code>(<var>A_REP</var>) \cdot (<var>B_REP</var>)</code></p>
<div class="solution" data-type="multiple">
- <span class="sol" data-fallback="0" data-inexact data-max-error="0.01">
+ <span class="sol" data-forms="integer,decimal" data-fallback="0" data-inexact data-max-error="0.01">
<var>ANSWER_REAL</var>
</span>
<code>+</code>
- <span class="sol" data-fallback="0" data-inexact data-max-error="0.01">
+ <span class="sol" data-forms="integer,decimal" data-fallback="0" data-inexact data-max-error="0.01">
<var>ANSWER_IMAG</var>
</span>
<code>i</code>
View
2 exercises/one_step_equations.html
@@ -21,7 +21,7 @@
</div>
<p class="question">Solve for <code><var>X</var></code>:</p>
<div class="solution" data-type="multiple">
- <p><code><var>X</var>=</code> <span class="sol"><var>B - A</var></code></p>
+ <p><code><var>X</var>=</code> <span class="sol" data-forms="integer"><var>B - A</var></code></p>
</div>
<div class="problems">
View
10 exercises/perimeter_1.html
@@ -35,7 +35,7 @@
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>4 * S</var></span> <var>plural(UNIT_TEXT)</var>
+ <span class="sol" data-forms="integer"><var>4 * S</var></span> <var>plural(UNIT_TEXT)</var>
</div>
<div class="hints">
@@ -80,7 +80,7 @@
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>L * 2 + W * 2</var></span> <var>plural(UNIT_TEXT)</var>
+ <span class="sol" data-forms="integer"><var>L * 2 + W * 2</var></span> <var>plural(UNIT_TEXT)</var>
</div>
<div class="hints">
@@ -127,7 +127,7 @@
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>A + B + C</var></span> <var>plural(UNIT_TEXT)</var>
+ <span class="sol" data-forms="integer"><var>A + B + C</var></span> <var>plural(UNIT_TEXT)</var>
</div>
<div class="hints">
@@ -183,7 +183,7 @@
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>S * SIDES</var></span> <var>plural(UNIT_TEXT)</var>
+ <span class="sol" data-forms="integer"><var>S * SIDES</var></span> <var>plural(UNIT_TEXT)</var>
</div>
<div class="hints">
@@ -262,7 +262,7 @@
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>SHAPE.perimeter</var></span>
+ <span class="sol" data-forms="integer"><var>SHAPE.perimeter</var></span>
<var>plural(UNIT_TEXT)</var>
</div>
View
6 exercises/perimeter_of_squares_and_rectangles.html
@@ -28,7 +28,7 @@
</p>
<div class="solution" data-type="multiple">
- <span class="sol"><var>4 * S</var></span>
+ <span class="sol" data-forms="integer"><var>4 * S</var></span>
<var>plural(UNIT_TEXT)</var>
</div>
@@ -81,7 +81,7 @@
</p>
<div class="solution" data-type="multiple">
- <span class="sol"><var>S</var></span>
+ <span class="sol" data-forms="integer"><var>S</var></span>
<var>plural(UNIT_TEXT)</var>
</div>
@@ -145,7 +145,7 @@
</p>
<div class="solution" data-type="multiple">
- <span class="sol"><var>2 * L + 2 * W</var></span>
+ <span class="sol" data-forms="integer"><var>2 * L + 2 * W</var></span>
<var>plural(UNIT_TEXT)</var>
</div>
View
7 exercises/pile_patterns.html
@@ -5,7 +5,8 @@
<title>Pile patterns</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
- #answer_area input[type=text] {
+ #answer_area input[type=text],
+ #answer_area input[type=number] {
width: 40px;
}
</style>
@@ -178,8 +179,8 @@
</div>
</div>
<div class="solution" data-type="multiple">
- In step 0, we have <span class="sol"><var>START</var></span> blocks. At each step, we add <span class="sol"><var>XS</var></span> more blocks.<br><br>
- So, at step number <code>S</code>, we have<br><span class="sol"><var>START</var></span> <code>+</code> <span class="sol"><var>XS</var></span> <code>\times S</code> blocks.
+ In step 0, we have <span class="sol" data-forms="integer"><var>START</var></span> blocks. At each step, we add <span class="sol" data-forms="integer"><var>XS</var></span> more blocks.<br><br>
+ So, at step number <code>S</code>, we have<br><span class="sol" data-forms="integer"><var>START</var></span> <code>+</code> <span class="sol" data-forms="integer"><var>XS</var></span> <code>\times S</code> blocks.
</div>
<div class="hints">
<p>The number of blocks in the diagram make an arithmetic progression. This means that at each step, the same number of blocks are added. We want to find a way to know how many blocks there will be at any step.</p>
View
2 exercises/plugging_in_values.html
@@ -161,7 +161,7 @@
<p><b>Find the missing values.</b></p>
</div>
<div class="solution" data-each="TABLEVALS as tableval" data-type="multiple">
- <p data-if="tableval.yval === ' '"><code>f(<var>tableval.xval</var>)</code> = <span class="sol"><var>COEF * tableval.xval + CONS</var></span></p>
+ <p data-if="tableval.yval === ' '"><code>f(<var>tableval.xval</var>)</code> = <span class="sol" data-forms="integer, decimal"><var>COEF * tableval.xval + CONS</var></span></p>
</div>
<div class="hints">
<p>Plug the corresponding values of <code class="hint_orange">x</code> into the equation to find the missing values of <code class="hint_blue">f(x)</code>.</p>
View
2 exercises/quadrilateral_angles.html
@@ -43,7 +43,7 @@
</div>
</div>
<div class="solution" data-type="multiple">
- <span class="sol"><var>ANGLES[ ANSWER_POS ]</var></span><code>\Large {}^\circ</code>
+ <span class="sol" data-forms="integer"><var>ANGLES[ ANSWER_POS ]</var></span><code>\Large {}^\circ</code>
</div>
<div class="hints">
<p>This figure is a trapezoid.</p>
View
2 exercises/range_of_a_function.html
@@ -29,7 +29,7 @@
<span class="sol" data-type="list" data-choices="['', '&lt;', '&gt;', '&le;', '&ge;', '&ne;']">
<var>A > 0 ? "&ge;" : "&le;"</var>
</span>
- <span class="sol"><var>B</var></span>
+ <span class="sol" data-forms="integer, decimal"><var>B</var></span>
<code>\,\}</code>
</p>
View
2 exercises/reading_bar_charts_1.html
@@ -43,7 +43,7 @@
</div>
<div class="solution" data-type="multiple">
- <span style="padding-right: 5px" class="sol"><var>VALUES[ INDEX ]</var></span> house points
+ <span style="padding-right: 5px" class="sol" data-forms="integer, decimal"><var>VALUES[ INDEX ]</var></span> house points
</div>
<div class="hints">
View
2 exercises/reading_line_charts_1.html
@@ -45,7 +45,7 @@
</div>
<div class="solution" data-type="multiple">
- <span style="padding-right: 5px" class="sol"><var>VALUES[ INDEX ]</var></span> <var>color( 1 )</var> <var>plural( clothing( 1 ) )</var>
+ <span style="padding-right: 5px" class="sol" data-forms="integer, decimal"><var>VALUES[ INDEX ]</var></span> <var>color( 1 )</var> <var>plural( clothing( 1 ) )</var>
</div>
<div class="hints">
View
6 exercises/reading_pictographs_2.html
@@ -59,7 +59,7 @@
<p class="question">How many <var>BADGE</var> badges did <var>person( PERSON + 1 )</var> earn?</p>
<div class="solution" data-type="multiple">
- <p><span style="padding-right: 5px" class="sol" data-forms="integer"><var>ANSWER</var></span> <var>BADGE</var> badges</p>
+ <p><span style="padding-right: 5px" class="sol" data-forms="integer, decimal"><var>ANSWER</var></span> <var>BADGE</var> badges</p>
</div>
<div class="hints">
<p>The key at the bottom of the pictograph shows that each full symbol represents <var>plural( VALUE_PER_IMG, "badge" )</var>.</p>
@@ -146,7 +146,7 @@
<p class="question">How many more <var>BADGE</var> badges did <var>person( PERSON1 + 1 )</var> earn than <var>person( PERSON2 + 1 )</var>?</p>
<div class="solution" data-type="multiple">
- <p><span style="padding-right: 5px" class="sol" data-forms="integer"><var>VAL1 - VAL2</var></span> <var>BADGE</var> badges</p>
+ <p><span style="padding-right: 5px" class="sol" data-forms="integer, decimal"><var>VAL1 - VAL2</var></span> <var>BADGE</var> badges</p>
</div>
<div class="hints">
<p>The key at the bottom of the pictograph shows that each full symbol represents <var>plural( VALUE_PER_IMG, "badge" )</var>.</p>
@@ -187,7 +187,7 @@
<p class="question">How many <var>BADGE</var> badges were earned by everyone all together?</p>
<div class="solution" data-type="multiple">
- <p><span style="padding-right: 5px" class="sol" data-forms="integer"><var>TOTAL</var></span> <var>BADGE</var> badges</p>
+ <p><span style="padding-right: 5px" class="sol" data-forms="integer, decimal"><var>TOTAL</var></span> <var>BADGE</var> badges</p>
</div>
<div class="hints">
<p>Start by counting the total number of <var>BADGE</var> symbols.</p>
View
2 exercises/reading_tables_1.html
@@ -75,7 +75,7 @@
<span><var>row</var></span><span data-each="ENROLLMENTS[i] as j, enrollment"><var>enrollment</var></span>
</div>
<div class="solution" data-type="multiple">
- <span style="padding-right: 5px" class="sol"><var>ANSWER</var></span> <var>UNIT</var>
+ <span style="padding-right: 5px" class="sol" data-forms="integer"><var>ANSWER</var></span> <var>UNIT</var>
</div>
<div class="hints">
View
2 exercises/reading_tables_2.html
@@ -73,7 +73,7 @@
<span><var>row</var></span><span data-each="ENROLLMENTS[i] as j, enrollment"><var>enrollment</var></span>
</div>
<div class="solution" data-type="multiple">
- <span style="padding-right: 5px" class="sol"><var>ANSWER</var></span> <var>UNIT</var>
+ <span style="padding-right: 5px" class="sol" data-forms="integer"><var>ANSWER</var></span> <var>UNIT</var>
</div>
<div class="hints">
View
2 exercises/scalar_matrix_multiplication.html
@@ -67,7 +67,7 @@
<div class="solution" data-type="multiple">
<div data-each="PADDED_SOLN_MAT as row" class="matrix-row">
<span data-each="row as elem">
- <span data-if="elem !== ''" class="sol">
+ <span data-if="elem !== ''" class="sol" data-forms="integer">
<var>elem</var>
</span>
<span data-else data-type="text" class="sol">
View
10 exercises/scientific_notation.html
@@ -4,6 +4,12 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Scientific notation</title>
<script src="../khan-exercise.js"></script>
+ <style type="text/css">
+ #answer_area input[type=text],
+ #answer_area input[type=number] {
+ width: 30px;
+ }
+ </style>
</head>
<body>
<div class="exercise">
@@ -38,9 +44,9 @@
<p class="problem"><code><var>PRETTY_DECIMAL</var></code></p>
<div class="solution" data-type="multiple">
- <span class="sol base"><var>BASE</var></span>
+ <span class="sol base" data-forms="integer, decimal"><var>BASE</var></span>
<code> \times 10 </code>
- <sup class="sol exp" style="width: 20px;"><var>E</var></sup>
+ <sup class="sol exp" data-forms="integer, decimal" style="width: 20px;"><var>E</var></sup>
</div>
<div class="hints">
View
9 exercises/simplifying_expressions_with_exponents.html
@@ -5,8 +5,9 @@
<title>Simplifying expressions with exponents</title>
<script src="../khan-exercise.js"></script>
<style type="text/css">
- #answer_area input[type=text] {
- width: 30px;
+ #answer_area input[type=text],
+ #answer_area input[type=number] {
+ width: 30px;
}
</style>
</head>
@@ -45,7 +46,7 @@
<p><code>\dfrac{\color{orange}{<var>expr( NUM )</var>}}{\color{green}{<var>expr( DEN )</var>}}</code></p>
<div class="solution" data-type="multiple">
- <p><code><var>BASE1</var></code><span class="sol exp"><var>EXP1</var></span><code><var>BASE2</var></code><span class="sol exp"><var>EXP2</var></span></p>
+ <p><code><var>BASE1</var></code><span class="sol exp" data-forms="integer"><var>EXP1</var></span><code><var>BASE2</var></code><span class="sol exp" data-forms="integer"><var>EXP2</var></span></p>
<p class="example">enter a (possibly negative) integer for each exponent</p>
</div>
@@ -86,7 +87,7 @@
<p><code>\dfrac{\color{orange}{<var>expr( NUM )</var>}}{\color{green}{<var>expr( DEN )</var>}}</code></p>
<div class="solution" data-type="multiple">
- <p><code><var>BASE1</var></code><span class="sol exp"><var>EXP1</var></span><code><var>BASE2</var></code><span class="sol exp"><var>EXP2</var></span></p>
+ <p><code><var>BASE1</var></code><span class="sol exp" data-forms="integer"><var>EXP1</var></span><code><var>BASE2</var></code><span class="sol exp" data-forms="integer"><var>EXP2</var></span></p>
<p class="example">enter a (possibly negative) integer for each exponent</p>
</div>
View
4 exercises/solid_geometry.html
@@ -262,7 +262,7 @@
What is the volume of this box? Drag on the box to rotate it.
</p>
- <div class="solution">
+ <div class="solution" data-forms="integer">
<var>LENGTH * WIDTH * HEIGHT</var>
</div>
@@ -297,7 +297,7 @@
Drag on the box to rotate it.
</p>
- <div class="solution">
+ <div class="solution" data-forms="integer">
<var>2 * LENGTH * WIDTH +
2 * LENGTH * HEIGHT +
2 * WIDTH * HEIGHT</var>
View
2 exercises/square_roots.html
@@ -62,7 +62,7 @@
<p class="question"><code>\Large{\sqrt{<var>Q</var>} = \text{?}}</code></p>
- <p class="solution"><var>N</var></p>
+ <p class="solution" data-forms="integer, decimal"><var>N</var></p>
<div class="hints" data-apply="prependContents">
<p>
View
2 exercises/square_roots_2.html
@@ -31,7 +31,7 @@
<p class="solution"><var>N</var></p>
<div class="solution" data-type="multiple">
- <p><span class="sol short"><var>N</var></span> <code>&lt; \sqrt{<var>Q</var>} &lt;</code> <span class="sol short"><var>N + 1</var></span></p>
+ <p><span class="sol short" data-forms="integer"><var>N</var></span> <code>&lt; \sqrt{<var>Q</var>} &lt;</code> <span class="sol short" data-forms="integer"><var>N + 1</var></span></p>
<span class="example">two integers, like <code>6</code></span>
</div>
View
2 exercises/telling_time_0.5.html
@@ -34,7 +34,7 @@
<div style="clear: both;"></div>
</div>
<div class="solution" data-type="multiple">
- <p class="short">The time is:<br><span class="sol"><var>HOUR</var></span> : <span class="sol"><var>NICE_MINUTE</var></span> <var>AM_PM</var></p>
+ <p class="short">The time is:<br><span class="sol" data-forms="integer"><var>HOUR</var></span> : <span class="sol" data-forms="integer"><var>NICE_MINUTE</var></span> <var>AM_PM</var></p>
<p class="example">a 12-hour time in hours and minutes</p>
</div>
View
4 exercises/translations_of_points_and_polygons.html
@@ -253,9 +253,9 @@
<div class="solution" data-type="multiple">
<code>{\LARGE T } \;(</code>
- <span class="sol" style="width:15px"><var>DX</var></span>
+ <span class="sol" data-forms="integer" style="width:15px"><var>DX</var></span>
<code>,</code>
- <span class="sol" style="width:15px"><var>DY</var></span>
+ <span class="sol" data-forms="integer" style="width:15px"><var>DY</var></span>
<code>)</code>
</div>
View
8 exercises/triangle_angles_1.html
@@ -63,7 +63,7 @@
</div>
</div>
- <div class="solution" data-type="multiple"><p><code>X =</code><span class="sol"><var>TRIANGLE[ 0 ][ 2 ]</var></span></div>
+ <div class="solution" data-type="multiple"><p><code>X =</code><span class="sol" data-forms="integer"><var>TRIANGLE[ 0 ][ 2 ]</var></span></div>
<div class="hints">
<p>Angles in a triangle add up to 180 degrees.</p>
<p>We know two angles of the triangle.</p>
@@ -87,7 +87,7 @@
tr.drawLabels();
</div>
</div>
- <div class="solution" data-type="multiple"><p><code>X =</code><span class="sol"><var>TRIANGLE[ 0 ][ 2 ]</var></span></div>
+ <div class="solution" data-type="multiple"><p><code>X =</code><span class="sol" data-forms="integer"><var>TRIANGLE[ 0 ][ 2 ]</var></span></div>
<div class="hints">
<p>Angles in a triangle add up to 180 degrees.</p>
@@ -117,7 +117,7 @@
tr.drawLabels();
</div>
</div>
- <div class="solution" data-type="multiple"><p><code>X =</code><span class="sol"><var>TRIANGLE[ 0 ][ 0 ]</var></span></div>
+ <div class="solution" data-type="multiple"><p><code>X =</code><span class="sol" data-forms="integer"><var>TRIANGLE[ 0 ][ 0 ]</var></span></div>
<div class="hints">
<p>Angles in a triangle add up to 180 degrees.</p>
@@ -149,7 +149,7 @@
tr.drawLabels();
</div>
</div>
- <div class="solution" data-type="multiple"><p><code>X =</code><span class="sol"><var>TRIANGLE[ 0 ][ 0 ]</var></span></div>
+ <div class="solution" data-type="multiple"><p><code>X =</code><span class="sol" data-forms="integer"><var>TRIANGLE[ 0 ][ 0 ]</var></span></div>
<div class="hints">
<p>Angles in a triangle add up to 180 degrees.</p>
<p>Because this triangle has two sides equal, it also has two angles equal (it is an isosceles triangle).</p>
View
2 exercises/triangle_inequality_theorem.html
@@ -54,7 +54,7 @@
</div>
</div>
<div class="solution" data-type="multiple">
- <p><span class="sol"><var>MIN</var></span> <code>&lt; x &lt;</code> <span class="sol"><var>MAX</var></span></p>
+ <p><span class="sol" data-forms="integer, decimal"><var>MIN</var></span> <code>&lt; x &lt;</code> <span class="sol" data-forms="integer, decimal"><var>MAX</var></span></p>
<span class="example">two <em>exact</em> decimals, like <code>0.75</code></span>
</div>
<div class="hints">
View
2 exercises/vertex_of_a_parabola.html
@@ -54,7 +54,7 @@
<p class="question">Find the parabola's vertex.</p>
<div class="solution" data-type="multiple">
- <p><code>\large{\left(\right.}</code><span class="sol"><var>H</var></span><code>,\text{ }</code><span class="sol"><var>K</var></span><code>\large{\left.\right)}</code></p>
+ <p><code>\large{\left(\right.}</code><span class="sol" data-forms="integer"><var>H</var></span><code>,\text{ }</code><span class="sol" data-forms="integer"><var>K</var></span><code>\large{\left.\right)}</code></p>
<div class="example">a point, like <code>(-1, 2)</code> </div>
</div>

0 comments on commit eaa5f38

Please sign in to comment.