Use requirejs for module loading

Summary: Also did some misc cleanup in khan-exercise.js, mostly related to module-y things ("151 ++----"). I combined local jquery-ui into one file to make it easier to load. Test Plan: Opened addition_1, deriviative_intuition, graphing_points_2 locally, and all looked fine. In webapp/khan-exercises/, ran: ``` npm install -g requirejs r.js -o requirejs.config.js ``` then saw that /exercises/addition_1 looked right. Reviewers: eater, jack Reviewed By: jack CC: alex Differential Revision: http://phabricator.khanacademy.org/D7095
Khan · Mar 5, 2014 · ac1415e · ac1415e
1 parent 9c31e6b
commit ac1415e
Show file tree

Hide file tree

Showing 501 changed files with 10,303 additions and 7,621 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 _hashed-*.js
 exercises-packed
 exercises-packed.zip
+genfiles/**
diff --git a/exercises/absolute_value.html b/exercises/absolute_value.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Finding absolute values</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/absolute_value_equations.html b/exercises/absolute_value_equations.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Absolute value equations</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/absolute_value_of_complex_numbers.html b/exercises/absolute_value_of_complex_numbers.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>Absolute value of complex numbers</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_and_subtracting_complex_numbers.html b/exercises/adding_and_subtracting_complex_numbers.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <title>Adding and subtracting complex numbers</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_and_subtracting_decimals_word_problems.html b/exercises/adding_and_subtracting_decimals_word_problems.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting decimals word problems</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_and_subtracting_fractions.html b/exercises/adding_and_subtracting_fractions.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting fractions</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_and_subtracting_negative_numbers.html b/exercises/adding_and_subtracting_negative_numbers.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting negative numbers</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_and_subtracting_polynomials.html b/exercises/adding_and_subtracting_polynomials.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting polynomials</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_and_subtracting_radicals.html b/exercises/adding_and_subtracting_radicals.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting radicals</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_and_subtracting_rational_expressions.html b/exercises/adding_and_subtracting_rational_expressions.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting rational expressions 1</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
     <style type="text/css">
         #solutionarea td {
             text-align: center;

diff --git a/exercises/adding_and_subtracting_rational_expressions_0.5.html b/exercises/adding_and_subtracting_rational_expressions_0.5.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting rational expressions 0.5</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
     <style type="text/css">
         #solutionarea td {
             text-align: center;

diff --git a/exercises/adding_and_subtracting_rational_expressions_1.5.html b/exercises/adding_and_subtracting_rational_expressions_1.5.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting rational expressions 1.5</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
     <script type="text/javascript">
         function getRationalExpression(variables) {
             var terms = [];

diff --git a/exercises/adding_and_subtracting_rational_expressions_2.html b/exercises/adding_and_subtracting_rational_expressions_2.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting rational expressions 2</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
     <style type="text/css">
         #solutionarea td {
             text-align: center;

diff --git a/exercises/adding_and_subtracting_rational_expressions_3.html b/exercises/adding_and_subtracting_rational_expressions_3.html
@@ -2,7 +2,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting rational expressions 3</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
     <style type="text/css">
         #solutionarea td {
             text-align: center;

diff --git a/exercises/adding_and_subtracting_rational_expressions_5.html b/exercises/adding_and_subtracting_rational_expressions_5.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting with unlike denominators 5</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_and_subtracting_rational_expressions_6.html b/exercises/adding_and_subtracting_rational_expressions_6.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting with unlike denominators 6</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_and_subtracting_rational_numbers.html b/exercises/adding_and_subtracting_rational_numbers.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding and subtracting rational numbers</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_decimals.html b/exercises/adding_decimals.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding decimals 1</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_decimals_0.5.html b/exercises/adding_decimals_0.5.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding decimals 0.5</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_decimals_2.html b/exercises/adding_decimals_2.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding decimals 2</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_fractions.html b/exercises/adding_fractions.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding fractions</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_fractions_0.5.html b/exercises/adding_fractions_0.5.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding fractions 0.5</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
 <div class="exercise">

diff --git a/exercises/adding_fractions_with_common_denominators.html b/exercises/adding_fractions_with_common_denominators.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding fractions with common denominators</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_negative_numbers.html b/exercises/adding_negative_numbers.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding negative numbers</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/adding_subtracting_mixed_numbers_0.5.html b/exercises/adding_subtracting_mixed_numbers_0.5.html
@@ -2,7 +2,7 @@
 <html data-require="math math-format">
 <head>
     <title>Adding and subtracting mixed numbers 0.5</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 
 <body>

diff --git a/exercises/adding_subtracting_mixed_numbers_1.html b/exercises/adding_subtracting_mixed_numbers_1.html
@@ -2,7 +2,7 @@
 <html data-require="math math-format">
 <head>
     <title>Adding and subtracting mixed numbers 1</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 
 <body>

diff --git a/exercises/adding_vectors.html b/exercises/adding_vectors.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Adding vectors</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/addition_1.html b/exercises/addition_1.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>1-digit addition</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/addition_2.html b/exercises/addition_2.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>2-digit addition</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/addition_3.html b/exercises/addition_3.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Addition with carrying</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/addition_4.html b/exercises/addition_4.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>4-digit addition with carrying</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
 <div class="exercise">

diff --git a/exercises/age_word_problems.html b/exercises/age_word_problems.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Age word problems</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/angle_addition_postulate.html b/exercises/angle_addition_postulate.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Angle addition postulate</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
 <div class="exercise">

diff --git a/exercises/angle_bisector_theorem.html b/exercises/angle_bisector_theorem.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Angle bisector theorem</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/angle_types.html b/exercises/angle_types.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Angle types</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
     <script>
         function protractorHint( pro, rot, angle ) {
             pro.translate( 0, 0, true );

diff --git a/exercises/angles_1.html b/exercises/angles_1.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Angles 1</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/angles_2.html b/exercises/angles_2.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Angles 2</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/angles_of_a_polygon.html b/exercises/angles_of_a_polygon.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Angles of a polygon</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
     <div class="exercise">

diff --git a/exercises/area_1.html b/exercises/area_1.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Area 1</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
 <div class="exercise">

diff --git a/exercises/area_of_a_circle.html b/exercises/area_of_a_circle.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Area of a circle</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
     <script type="text/javascript">
         var R_COLOR = "purple";
         var D_COLOR = "green";

diff --git a/exercises/area_of_parallelograms.html b/exercises/area_of_parallelograms.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Area of parallelograms</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 
     <script type="text/javascript">
         KhanUtil.parallelogram = function(B, H, UNIT, SH) {

diff --git a/exercises/area_of_squares_and_rectangles.html b/exercises/area_of_squares_and_rectangles.html
@@ -3,7 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Area problems</title>
-    <script src="../khan-exercise.js"></script>
+    <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
 </head>
 <body>
 <div class="exercise">

diff --git a/exercises/areas_of_circles_and_sectors.html b/exercises/areas_of_circles_and_sectors.html
@@ -2,7 +2,7 @@
 <html data-require="math math-format graphie graphie-helpers">
 <head>
         <title>Areas of circles and sectors</title>
-        <script src="../khan-exercise.js"></script>
+        <script data-main="../local-only/main.js" src="../local-only/require.js"></script>
     </head>
     <body>
         <div class="exercise">