Migrated client.js to be used with require()

jamesshore · jamesshore · commit ceeaa80eff82 · 2013-05-22T13:24:35.000-07:00
diff --git a/Jakefile.js b/Jakefile.js
@@ -208,8 +208,9 @@
 			wwp: true,
 
 			// Browserify
-			module: false,
 			require: false,
+			module: false,
+			exports: false,
 
 			// Mocha / expect.js
 			describe: false,
diff --git a/src/client/_client_test.js b/src/client/_client_test.js
@@ -4,6 +4,7 @@
 (function() {
 	"use strict";
 
+	var client = require("./client.js");
 	var HtmlElement = require("./html_element.js");
 
 	mocha.setup({ignoreLeaks: true});
@@ -17,12 +18,12 @@
 			documentBody = new HtmlElement($(document.body));
 			drawingArea = HtmlElement.fromHtml("<div style='height: 300px; width: 600px'>hi</div>");
 			drawingArea.appendSelfToBody();
-			svgCanvas = wwp.initializeDrawingArea(drawingArea);
+			svgCanvas = client.initializeDrawingArea(drawingArea);
 		});
 
 		afterEach(function() {
 			drawingArea.remove();
-			wwp.drawingAreaHasBeenRemovedFromDom();
+			client.drawingAreaHasBeenRemovedFromDom();
 		});
 
 		it("should have the same dimensions as its enclosing div", function() {
diff --git a/src/client/_svg_canvas_test.js b/src/client/_svg_canvas_test.js
@@ -20,7 +20,6 @@
 
 		afterEach(function() {
 			div.remove();
-			wwp.drawingAreaHasBeenRemovedFromDom();
 		});
 
 		it("returns height and width", function() {
diff --git a/src/client/client.js b/src/client/client.js
@@ -12,7 +12,7 @@ window.wwp = window.wwp || {};
 	var start = null;
 	var drawingArea;
 
-	wwp.initializeDrawingArea = function(htmlElement) {
+	exports.initializeDrawingArea = wwp.initializeDrawingArea = function(htmlElement) {
 		if (svgCanvas !== null) throw new Error("Client.js is not re-entrant");
 		drawingArea = htmlElement;
 
@@ -21,7 +21,7 @@ window.wwp = window.wwp || {};
 		return svgCanvas;
 	};
 
-	wwp.drawingAreaHasBeenRemovedFromDom = function() {
+	exports.drawingAreaHasBeenRemovedFromDom = wwp.drawingAreaHasBeenRemovedFromDom = function() {
 		svgCanvas = null;
 	};
 
diff --git a/src/client/html_element.js b/src/client/html_element.js
@@ -1,8 +1,6 @@
 // Copyright (c) 2013 Titanium I.T. LLC. All rights reserved. See LICENSE.txt for details.
 /*global $, jQuery, TouchList, Touch */
 
-window.wwp = window.wwp || {};
-
 (function() {
 	"use strict";
 
diff --git a/todo.txt b/todo.txt
@@ -22,8 +22,6 @@ Engineering Tasks:
   - Use Modernizr to eliminate duplicate browserSupportsTouchEvents() function (in _client_test.js & _dom_element_test.js)
 
 To Do on current task:
-- Get tests working with require()
-  - Migrate HtmlElement and client tests to use require()
 - Get index.html working with require()
 - Figure out how to bundle vendor files
 - What about deployment? (Punt?)
