Add script includes to exercises that need them

marijnh · marijnh · commit 63f957108c13 · 2014-06-18T13:42:20.000+02:00
diff --git a/14_event.txt b/14_event.txt
@@ -921,6 +921,7 @@ ifdef::html_target[]
     height: 300px;
   }
 </style>
+
 <script>
   // Your code here.
 </script>
diff --git a/bin/get_exercises.js b/bin/get_exercises.js
@@ -36,10 +36,12 @@ fs.readdirSync(".").forEach(function(file) {
       var type = sourceBlock[1].indexOf("html") > -1 ? "html" : "js";
       var file = chapNum + "_" + num + "_" + match[1].toLowerCase().replace(/[^\-\s\w]/g, "").replace(/\s/g, "_") + "." + type;
       try {
-        var solution = fs.readFileSync("code/solutions/" + file, "utf8").trim();
+        var solution = fs.readFileSync("code/solutions/" + file, "utf8");
+        var extra = /^\s*<!doctype html>\s*(<base .*\n(<script src=.*\n)*)?/.exec(solution);
+        if (extra) solution = solution.slice(extra[0].length);
         allSolutions.splice(allSolutions.indexOf(file), 1);
       } catch(e) {
-        console.error("File ", file, " does not exist.");
+        console.error("File ", file, " does not exist.", e);
         failed = true;
       }
       if (sourceBlock) {
@@ -49,7 +51,7 @@ fs.readdirSync(".").forEach(function(file) {
           number: num,
           type: type,
           code: sourceBlock[2],
-          solution: solution
+          solution: solution.trim()
         });
         break;
       }
diff --git a/code/solutions/13_1_build_a_table.html b/code/solutions/13_1_build_a_table.html
@@ -1,12 +1,16 @@
 <!doctype html>
 
+<base href="http://eloquentjavascript.net/">
+<script src="code/mountains.js"></script>
+
 <style>
   /* Defines a cleaner look for tables */
   table  { border-collapse: collapse; }
   td, th { border: 1px solid black; padding: 3px 8px; }
   th     { text-align: left; }
 </style>
 
+<body>
 <script>
   function buildTable(data) {
     var table = document.createElement("table");
@@ -37,3 +41,4 @@
 
   document.body.appendChild(buildTable(MOUNTAINS));
 </script>
+</body>
diff --git a/code/solutions/13_3_the_cats_hat.html b/code/solutions/13_3_the_cats_hat.html
@@ -1,5 +1,7 @@
 <!doctype html>
 
+<base href="http://eloquentjavascript.net/">
+
 <body style="min-height: 200px">
 
 <img src="img/cat.png" id="cat" style="position: absolute">
diff --git a/code/solutions/14_2_mouse_trail.html b/code/solutions/14_2_mouse_trail.html
@@ -12,6 +12,7 @@
   }
 </style>
 
+<body>
 <script>
   var dots = [];
   for (var i = 0; i < 12; i++) {
@@ -29,3 +30,4 @@
     currentDot = (currentDot + 1) % dots.length;
   });
 </script>
+</body>
diff --git a/code/solutions/15_1_game_over.html b/code/solutions/15_1_game_over.html
@@ -1,7 +1,12 @@
 <!doctype html>
 
+<base href="http://eloquentjavascript.net/">
+<script src="code/game_levels.js"></script>
+<script src="code/chapter/15_game.js"></script>
+
 <link rel="stylesheet" href="css/game.css">
 
+<body>
 <script>
   function runGame(plans, Display) {
     function startLevel(n, lives) {
@@ -24,3 +29,4 @@
   }
   runGame(GAME_LEVELS, DOMDisplay);
 </script>
+</body>
diff --git a/code/solutions/15_2_pausing_the_game.html b/code/solutions/15_2_pausing_the_game.html
@@ -1,7 +1,12 @@
 <!doctype html>
 
+<base href="http://eloquentjavascript.net/">
+<script src="code/game_levels.js"></script>
+<script src="code/chapter/15_game.js"></script>
+
 <link rel="stylesheet" href="css/game.css">
 
+<body>
 <script>
   // To know when to stop and restart the animation, a level that is
   // being displayed may be in three states:
@@ -81,3 +86,4 @@
 
   runGame(GAME_LEVELS, DOMDisplay);
 </script>
+</body>
diff --git a/code/solutions/16_2_the_pie_chart.html b/code/solutions/16_2_the_pie_chart.html
@@ -1,5 +1,8 @@
 <!doctype html>
 
+<base href="http://eloquentjavascript.net/">
+<script src="code/chapter/16_canvas.js"></script>
+
 <canvas width="600" height="300"></canvas>
 <script>
   var cx = document.querySelector("canvas").getContext("2d");
diff --git a/code/solutions/19_1_rectangles.html b/code/solutions/19_1_rectangles.html
@@ -1,5 +1,8 @@
 <!doctype html>
 
+<base href="http://eloquentjavascript.net/">
+<script src="code/chapter/19_paint.js"></script>
+
 <script>
   function rectangleFrom(a, b) {
     return {left: Math.min(a.x, b.x),
diff --git a/code/solutions/19_2_color_picker.html b/code/solutions/19_2_color_picker.html
@@ -1,5 +1,8 @@
 <!doctype html>
 
+<base href="http://eloquentjavascript.net/">
+<script src="code/chapter/19_paint.js"></script>
+
 <script>
   function colorAt(cx, x, y) {
     var pixel = cx.getImageData(x, y, 1, 1).data;
diff --git a/code/solutions/19_3_flood_fill.html b/code/solutions/19_3_flood_fill.html
@@ -1,5 +1,8 @@
 <!doctype html>
 
+<base href="http://eloquentjavascript.net/">
+<script src="code/chapter/19_paint.js"></script>
+
 <script>
   // Call a given function for all horizontal and vertical neighbors
   // of the given point.

Original file line number	Diff line number	Diff line change
`@@ -921,6 +921,7 @@ ifdef::html_target[]`
`921`	`921`	`height: 300px;`
`922`	`922`	`}`
`923`	`923`	`</style>`
	`924`	`+`
`924`	`925`	`<script>`
`925`	`926`	`// Your code here.`
`926`	`927`	`</script>`