---

yaml
---
r: 236587
b: refs/heads/tmp
c: 9f770a7
h: refs/heads/master
i:
  236585: 7d54478
  236583: 71e60d7
v: v3

Author: nhowell

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 115ec662b514c0dcbd1fc40648c4e11d09c949d7
+refs/heads/tmp: 9f770a753619322077690274b493c150a4c5a518
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/rustbook/build.rs

@@ -23,8 +23,6 @@ use error::{err, CliResult, CommandResult};
 use book;
 use book::{Book, BookItem};
 
-use javascript;
-
 use rustdoc;
 
 struct Build;
@@ -113,26 +111,28 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
         // write the prelude to a temporary HTML file for rustdoc inclusion
         let prelude = tmp.path().join("prelude.html");
         {
-            let mut toc = BufWriter::new(try!(File::create(&prelude)));
-            try!(writeln!(&mut toc, r#"<div id="nav">
-                <button id="toggle-nav">
-                  <span class="sr-only">Toggle navigation</span>
-                  <span class="bar"></span>
-                  <span class="bar"></span>
-                  <span class="bar"></span>
-                </button>
-              </div>"#));
-            let _ = write_toc(book, &item, &mut toc);
-            try!(writeln!(&mut toc, "<div id='page-wrapper'>"));
-            try!(writeln!(&mut toc, "<div id='page'>"));
+            let mut buffer = BufWriter::new(try!(File::create(&prelude)));
+            try!(writeln!(&mut buffer, r#"
+                <div id="nav">
+                    <button id="toggle-nav">
+                        <span class="sr-only">Toggle navigation</span>
+                        <span class="bar"></span>
+                        <span class="bar"></span>
+                        <span class="bar"></span>
+                    </button>
+                </div>"#));
+            let _ = write_toc(book, &item, &mut buffer);
+            try!(writeln!(&mut buffer, "<div id='page-wrapper'>"));
+            try!(writeln!(&mut buffer, "<div id='page'>"));
         }
 
         // write the postlude to a temporary HTML file for rustdoc inclusion
         let postlude = tmp.path().join("postlude.html");
         {
-            let mut toc = BufWriter::new(try!(File::create(&postlude)));
-            try!(toc.write_all(javascript::JAVASCRIPT.as_bytes()));
-            try!(writeln!(&mut toc, "</div></div>"));
+            let mut buffer = BufWriter::new(try!(File::create(&postlude)));
+            try!(writeln!(&mut buffer, "<script src='rustbook.js'></script>"));
+            try!(writeln!(&mut buffer, "<script src='playpen.js'></script>"));
+            try!(writeln!(&mut buffer, "</div></div>"));
         }
 
         try!(fs::create_dir_all(&out_path));

branches/tmp/src/rustbook/javascript.rs

@@ -35,8 +35,6 @@ mod build;
 mod serve;
 mod test;
 
-mod javascript;
-
 static EXIT_STATUS: AtomicIsize = ATOMIC_ISIZE_INIT;
 
 fn main() {