Merge branch 'part/4'

i-like-robots · Jun 30, 2014 · 35f4c79 · 35f4c79
2 parents 2b4a4a3 + bff421e
commit 35f4c79
Show file tree

Hide file tree

Showing 35 changed files with 20,364 additions and 2,533 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ bower_components
 heroku
 heroku.pub
 
+config.json
 test/spec/bundle.js
diff --git a/app/bootstrap.js → app/browser/bootstrap.jsx b/app/bootstrap.js → app/browser/bootstrap.jsx
@@ -1,10 +1,11 @@
 /** @jsx React.DOM */
-var data = require("./data");
 var React = require("react");
-var TubeTracker = require("./component/tube-tracker");
+var networkData = require("../common/data");
+var TubeTracker = require("../component/tube-tracker.jsx");
 
-window.app = (function(scope) {
+window.app = (function() {
   var requiredFeatures = {
+    "JSON decoding": window.JSON,
     "the selectors API": document.querySelector,
     "ES5 array methods": Array.prototype.forEach,
     "DOM level 2 events": window.addEventListener,
@@ -17,5 +18,6 @@ window.app = (function(scope) {
     }
   }
 
-  return React.renderComponent(<TubeTracker networkData={data} />, document.body);
+  var initialData = JSON.parse(document.getElementById("initial-data").innerHTML);
+  return React.renderComponent(<TubeTracker networkData={networkData} initialData={initialData} />, document.body);
 })();