Setup requirejs and mocha.

benbjohnson · Nov 12, 2013 · 84a0436 · 84a0436
1 parent e485d89
commit 84a0436
Show file tree

Hide file tree

Showing 33 changed files with 4,987 additions and 441 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1 @@
-components
-build
 node_modules
diff --git a/Makefile b/Makefile
@@ -1,24 +1,13 @@
 
-COMPONENT = node_modules/component/bin/component
 UGLIFY = node_modules/uglify-js/bin/uglifyjs
 PHANTOM = node_modules/.bin/mocha-phantomjs
 LINT = node_modules/.bin/jslint
 
-build: components lib/*.js
+test: lint
-	@component build --dev
-
-components: component.json
-	@component install --dev
-
-tsld.js: components
-	$(COMPONENT) build --standalone tsld --out . --name tsld
-	$(UGLIFY) tsld.js --output tsld.min.js
-
-test: lint build
 	$(PHANTOM) test/index.html
 
 lint:
-	$(LINT) lib/*.js
+	$(LINT) js/raft/*.js
 
 clean:
 	rm -fr build components template.js

diff --git a/component.json b/component.json
diff --git a/css/.DS_Store b/css/.DS_Store
diff --git a/css/bootstrap-theme.min.css b/css/bootstrap-theme.min.css
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
diff --git a/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot
diff --git a/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg
diff --git a/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf
diff --git a/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff
diff --git a/index.html b/index.html
@@ -2,10 +2,10 @@
 <html>
 <head>
 	<title>The Secret Lives of Data</title>
-	<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
+	<link href="css/bootstrap.min.css" rel="stylesheet">
-	<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
+	<script src="js/jquery-2.0.3.min.js"></script>
-	<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
+	<script src="js/bootstrap.min.js"></script>
-	<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+	<script src="js/d3.v3.min.js" charset="utf-8"></script>
 </head>
 
 <body>

diff --git a/js/bootstrap.min.js b/js/bootstrap.min.js
diff --git a/js/d3.v3.min.js b/js/d3.v3.min.js
diff --git a/js/jquery-2.0.3.min.js b/js/jquery-2.0.3.min.js
diff --git a/js/raft/node.js b/js/raft/node.js
@@ -0,0 +1,11 @@
+
+"use strict";
+/*jslint browser: true, nomen: true*/
+/*global define, d3*/
+
+define([], function () {
+    function Node() {
+    }
+
+    return Node;
+});
diff --git a/js/raft/simulation.js b/js/raft/simulation.js
@@ -0,0 +1,11 @@
+
+"use strict";
+/*jslint browser: true, nomen: true*/
+/*global define, d3*/
+
+define(["./node"], function (Node) {
+    function Simulation(player) {
+    }
+
+    return Simulation;
+});
diff --git a/js/require.js b/js/require.js
diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/raft/node.js b/lib/raft/node.js
diff --git a/lib/raft/raft.js b/lib/raft/raft.js
diff --git a/lib/tsld.js b/lib/tsld.js
diff --git a/package.json b/package.json
@@ -9,11 +9,8 @@
     "type": "git",
     "url": "git://github.com/benbjohnson/thesecretlivesofdata.git"
   },
-  "main": "tsld.js",
   "dependencies": {},
   "devDependencies": {
-    "component": "0.17.0",
-    "mocha-cloud": "0.1.0",
     "mocha-phantomjs": "3.1.2",
     "jslint": "0.1.9",
     "uglify-js": ">= 1.3.4"

diff --git a/playground.html b/playground.html