Use type=number on more exercises with multiple inputs.

Summary: Use type=number on Adding and Subtracting Complex Numbers. Use type=number on Adding and Subtracting Decimal Word Problems Use type=number on Adding Vectors Use type=number on Angle Addition Postulate Use type=number on Angles of a Polygon. Use type=number on Area 1. Use type=number on Area of Parallelograms. Use type=number on Area of Squares and Rectangles. Use type=number on Area of Triangles 1. Use type=number on Areas of Trapezoids, Rhombi and Kites. Test Plan: local, Chrome/OS X Reviewers: tom, eater Reviewed By: eater CC: stephanie, alpert Differential Revision: http://phabricator.khanacademy.org/D1030
Khan · Jan 17, 2013 · a1675a9 · a1675a9
1 parent 4b0f8d7
commit a1675a9
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 23 deletions.
diff --git a/exercises/adding_and_subtracting_complex_numbers.html b/exercises/adding_and_subtracting_complex_numbers.html
@@ -5,7 +5,8 @@
     <title>Adding and subtracting 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>
@@ -60,11 +61,11 @@
                 </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>

diff --git a/exercises/adding_and_subtracting_decimals_word_problems.html b/exercises/adding_and_subtracting_decimals_word_problems.html
@@ -74,7 +74,7 @@
                 <p class="question">How much faster was <var>person(2)</var> than <var>person(1)</var> in seconds?</p>
             </div>
             <div class="solution" data-type="multiple">
-                <p> <span class="sol"><var>time_1-time_2 </var></span> seconds</p>
+                <p> <span class="sol" data-forms="decimal"><var>time_1-time_2 </var></span> seconds</p>
             </div>
             <div class="hints">
                 <p>To find how much faster <var>person(2)</var> was than <var>person(1)</var>, we need to find the difference between their times in seconds.
@@ -119,7 +119,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                    <p><span class="sol"><var> weight_1+weight_2 </var></span> pounds</p>
+                    <p><span class="sol" data-forms="decimal"><var> weight_1+weight_2 </var></span> pounds</p>
             </div>
 
             <div class="hints">
@@ -202,7 +202,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <p> <span class="sol"><var>rain_2-rain_1 </var></span> inches</p>
+                <p> <span class="sol" data-forms="decimal"><var>rain_2-rain_1 </var></span> inches</p>
             </div>
             <div class="hints">
                 <p>To find the difference in rainfall, we can subtract the amount of rain in <var>person(1)</var>'s town from the amount of rain in <var>person(2)</var>'s town.
@@ -239,7 +239,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <p> <span class="sol"><var>distance_1+distance_2</var></span> <var>plural(distance(1))</var></p>
+                <p> <span class="sol" data-forms="decimal"><var>distance_1+distance_2</var></span> <var>plural(distance(1))</var></p>
             </div>
             <div class="hints">
                 <p>To find the total distance <var>person(1)</var> travels, we need to add the two distances together.

diff --git a/exercises/adding_vectors.html b/exercises/adding_vectors.html
@@ -5,7 +5,8 @@
     <title>Adding vectors</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>
@@ -51,7 +52,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <p><span class="sol" data-fallback="1"><var>AX + BX</var></span> <code>\hat\imath + {}</code><span class="sol" data-fallback="1"><var>AY + BY</var></span> <code>\hat\jmath</code></p>
+                <p><span class="sol" data-forms="integer" data-fallback="1"><var>AX + BX</var></span> <code>\hat\imath + {}</code><span class="sol" data-forms="integer" data-fallback="1"><var>AY + BY</var></span> <code>\hat\jmath</code></p>
             </div>
         </div>
     </div>

diff --git a/exercises/angles_of_a_polygon.html b/exercises/angles_of_a_polygon.html
@@ -27,7 +27,7 @@
                 CLONE = graph.polygon.clone();
             </div>
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>ANSWER</var></span> degrees
+                <span class="sol" data-forms="integer"><var>ANSWER</var></span> degrees
             </div>
             <div class="hints">
                 <p>There are a couple ways to approach this problem.</p>
@@ -71,7 +71,7 @@
                 graph.polygon.draw();
             </div>
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>360</var></span> degrees
+                <span class="sol" data-forms="integer"><var>360</var></span> degrees
             </div>
 
             <div class="hints">

diff --git a/exercises/area_1.html b/exercises/area_1.html
@@ -36,7 +36,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>S * S</var></span>
+                <span class="sol" data-forms="integer"><var>S * S</var></span>
                 square <var>plural(UNIT_TEXT)</var>
             </div>
 
@@ -105,7 +105,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>L * W</var></span>
+                <span class="sol" data-forms="integer"><var>L * W</var></span>
                 square <var>plural(UNIT_TEXT)</var>
             </div>
 
@@ -194,7 +194,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>SHAPE.area</var></span>
+                <span class="sol" data-forms="integer"><var>SHAPE.area</var></span>
                 square <var>plural(UNIT_TEXT)</var>
             </div>
 

diff --git a/exercises/area_of_parallelograms.html b/exercises/area_of_parallelograms.html
@@ -95,7 +95,7 @@
                 <div class="question">What is the parallelogram's area?</div>
 
                 <div class="solution" data-type="multiple">
-                    <span class="sol"><var>K</var></span>
+                    <span class="sol" data-forms="integer"><var>K</var></span>
                     square <var>plural(UNIT_TEXT)</var>
                 </div>
 

diff --git a/exercises/area_of_squares_and_rectangles.html b/exercises/area_of_squares_and_rectangles.html
@@ -28,7 +28,7 @@
             </p>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>S * S</var></span> square
+                <span class="sol" data-forms="integer"><var>S * S</var></span> square
                 <var>plural(UNIT_TEXT)</var>
             </div>
 
@@ -94,7 +94,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>
 
@@ -153,7 +153,7 @@
             </p>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>L * W</var></span> square
+                <span class="sol" data-forms="integer"><var>L * W</var></span> square
                 <var>plural(UNIT_TEXT)</var>
             </div>
 

diff --git a/exercises/area_of_triangles_1.html b/exercises/area_of_triangles_1.html
@@ -55,7 +55,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>(B * H) / 2</var></span>
+                <span class="sol" data-forms="integer"><var>(B * H) / 2</var></span>
                 square <var>plural(UNIT_TEXT)</var>
             </div>
 
@@ -129,7 +129,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>(B * H) / 2</var></span>
+                <span class="sol" data-forms="integer"><var>(B * H) / 2</var></span>
                 square <var>plural(UNIT_TEXT)</var>
             </div>
 
@@ -269,7 +269,7 @@
             </div>
 
             <div class="solution" data-type="multiple">
-                <span class="sol"><var>(B * H) / 2</var></span>
+                <span class="sol" data-forms="integer"><var>(B * H) / 2</var></span>
                 square <var>plural(UNIT_TEXT)</var>
             </div>
 

diff --git a/exercises/areas_of_trapezoids_rhombi_and_kites.html b/exercises/areas_of_trapezoids_rhombi_and_kites.html
@@ -57,7 +57,7 @@
                 </div>
 
                 <div class="solution" data-type="multiple">
-                    <span class="sol"><var>K</var></span>
+                    <span class="sol" data-forms="integer"><var>K</var></span>
                     square <var>plural(UNIT_TEXT)</var>
                 </div>
 
@@ -189,7 +189,7 @@
                 </div>
 
                 <div class="solution" data-type="multiple">
-                    <span class="sol"><var>K</var></span>
+                    <span class="sol" data-forms="integer"><var>K</var></span>
                     square <var>plural(UNIT_TEXT)</var>
                 </div>