Working on getting Browserify 'require()' calls in place (doesn't work yet)

jamesshore · jamesshore · commit a7c7fe4d7b65 · 2013-05-21T14:27:06.000-07:00
diff --git a/Jakefile.js b/Jakefile.js
@@ -71,7 +71,7 @@
 	}, {async: true});
 
 	desc("Test client code");
-	task("testClient", function() {
+	task("testClient", ["build"], function() {
 		karma.runTests(SUPPORTED_BROWSERS, complete, fail);
 	}, {async: true});
 
@@ -204,8 +204,12 @@
 	function clientGlobals() {
 		return {
 			wwp: true,
+
+			// Browserify
 			module: false,
+			require: false,
 
+			// Mocha / expect.js
 			describe: false,
 			it: false,
 			expect: false,
diff --git a/src/client/client.js b/src/client/client.js
@@ -6,6 +6,8 @@ window.wwp = window.wwp || {};
 (function() {
 	"use strict";
 
+	var SvgCanvas = require("./svg_canvas.js");
+
 	var svgCanvas = null;
 	var start = null;
 	var drawingArea;
diff --git a/src/client/svg_canvas.js b/src/client/svg_canvas.js
@@ -1,8 +1,6 @@
 // Copyright (c) 2013 Titanium I.T. LLC. All rights reserved. See LICENSE.TXT for details.
 /*global Raphael */
 
-window.wwp = window.wwp || {};
-
 (function() {
 	"use strict";
 
@@ -86,6 +84,6 @@ window.wwp = window.wwp || {};
 		];
 	}
 
-//	module.exports = SvgCanvas;
+	module.exports = SvgCanvas;
 
 }());
diff --git a/todo.txt b/todo.txt
@@ -27,6 +27,7 @@ To Do on current task:
 - What about deployment? (Punt?)
 - Duplication between weewikipaint.js CONTENT_DIR and our Jakefile
 - Do we want to copy src/server/ files to build directory?
+- Fix Karma error messages using source maps
 
 
 Future ideas:
