From 17ebfb5a4ba0dbf7b2a7042ded29c52f1ec2fb8c Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@hashcollision.org>
Date: Fri, 29 Mar 2013 18:01:33 -0600
Subject: [PATCH] correcting a few name collisions

---
 whalesong/image/private/kernel.js | 12 ++++++------
 whalesong/web-world/js-impl.js    |  4 ++--
 whalesong/world/kernel.js         |  4 ++--
 whalesong/world/raw-jsworld.js    |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/whalesong/image/private/kernel.js b/whalesong/image/private/kernel.js
index f06a877..7e5c8e6 100644
--- a/whalesong/image/private/kernel.js
+++ b/whalesong/image/private/kernel.js
@@ -133,9 +133,9 @@ var makeCanvas = function(width, height) {
     canvas.width = width;
     canvas.height = height;
 
-    $(canvas).css('width', canvas.width + "px");
-    $(canvas).css('height', canvas.height + "px");
-    $(canvas).css('padding', '0px');
+    jQuery(canvas).css('width', canvas.width + "px");
+    jQuery(canvas).css('height', canvas.height + "px");
+    jQuery(canvas).css('padding', '0px');
 
     // KLUDGE: IE compatibility uses /js/excanvas.js, and dynamic
     // elements must be marked this way.
@@ -185,14 +185,14 @@ BaseImage.prototype.toDomNode = function(params) {
     // for calling this after the dom node is attached to the
     // document.
     var onAfterAttach = function(event) {
-        // $(canvas).unbind('afterAttach', onAfterAttach);
+        // jQuery(canvas).unbind('afterAttach', onAfterAttach);
 	var ctx = this.getContext("2d");
 	that.render(ctx, 0, 0);
     };
-    $(canvas).bind('afterAttach', onAfterAttach);
+    jQuery(canvas).bind('afterAttach', onAfterAttach);
 
     // Canvases lose their drawn content on cloning.  data may help us to preserve it.
-    $(canvas).data('toRender', onAfterAttach);
+    jQuery(canvas).data('toRender', onAfterAttach);
 
     return canvas;
 };
diff --git a/whalesong/web-world/js-impl.js b/whalesong/web-world/js-impl.js
index 82cc2d2..d369601 100644
--- a/whalesong/web-world/js-impl.js
+++ b/whalesong/web-world/js-impl.js
@@ -1,6 +1,6 @@
 /*jslint browser: true, unparam: true, vars: true, white: true, plusplus: true, maxerr: 50, indent: 4, forin: true */
 /*global plt,MACHINE,$,EXPORTS,TreeCursor*/
-(function() {
+(function($) {
 
     "use strict";
 
@@ -2286,4 +2286,4 @@
     EXPORTS['EventHandler'] = EventHandler;
     EXPORTS['wrapFunction'] = wrapFunction;
     //////////////////////////////////////////////////////////////////////
-}());
+}(jQuery));
diff --git a/whalesong/world/kernel.js b/whalesong/world/kernel.js
index eabec9d..9e71ee8 100644
--- a/whalesong/world/kernel.js
+++ b/whalesong/world/kernel.js
@@ -24,9 +24,9 @@ var finalizeClosureCall = plt.baselib.functions.finalizeClosureCall;
 //////////////////////////////////////////////////////////////////////
 
 var bigBang = function(MACHINE, initW, handlers) {
-    var outerToplevelNode = $('<span/>').css('padding', '0px').get(0);
+    var outerToplevelNode = jQuery('<span/>').css('padding', '0px').get(0);
     MACHINE.params.currentOutputPort.writeDomNode(MACHINE, outerToplevelNode);
-    var toplevelNode = $('<span/>').css('padding', '0px').appendTo(outerToplevelNode).get(0);
+    var toplevelNode = jQuery('<span/>').css('padding', '0px').appendTo(outerToplevelNode).get(0);
 
     var configs = [];
     var isOutputConfigSeen = false;
diff --git a/whalesong/world/raw-jsworld.js b/whalesong/world/raw-jsworld.js
index dcb843a..dd406cb 100644
--- a/whalesong/world/raw-jsworld.js
+++ b/whalesong/world/raw-jsworld.js
@@ -731,8 +731,8 @@ var rawJsworld = {};
             return {
                 onRegister: function(top) {
                     //http://www.w3.org/TR/html5/editing.html#sequential-focus-navigation-and-the-tabindex-attribue
-                    $(top).attr('tabindex', 1);
-                    $(top).focus();
+                    jQuery(top).attr('tabindex', 1);
+                    jQuery(top).focus();
                     attachEvent(top, 'keydown', wrappedPress);
                 },
                 onUnregister: function(top) {