From ea1f9430ddb58f28b50cc702f9eb2612f19e308d Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Sun, 22 Mar 2009 23:41:15 -0700
Subject: Add fix so jQuery doesn't conflict with other Javascript libraries.

I think I finally got this one working.  The saving of the temporary variable has to happen *before* jQuery loads, or else jQuery has already stomped on the '$' variable that another library might have used.  This patch moves the temporary saving of this variable the HTML template so it tucks it aside before jQuery loads and puts it back after we're done.  Tested and works with jQuery, mootools, and prototype.---
 debug_toolbar/templates/debug_toolbar/base.html | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'debug_toolbar/templates')

diff --git a/debug_toolbar/templates/debug_toolbar/base.html b/debug_toolbar/templates/debug_toolbar/base.html
index 7277620..52b7a5b 100644
--- a/debug_toolbar/templates/debug_toolbar/base.html
+++ b/debug_toolbar/templates/debug_toolbar/base.html
@@ -1,10 +1,17 @@
 <script type="text/javascript" charset="utf-8">
+	// When jQuery is sourced, it's going to overwrite whatever might be in the
+	// '$' variable, so store a reference of it in a temporary variable...
+	var _$ = window.$;
 	if (typeof jQuery == 'undefined') {
 		var jquery_url = '{{ BASE_URL }}/__debug__/m/jquery.js';
 		document.write(unescape('%3Cscript src="' + jquery_url + '" type="text/javascript"%3E%3C/script%3E'));
 	}
 </script>
 <script type="text/javascript" src="{{ BASE_URL }}/__debug__/m/toolbar.min.js"></script>
+<script type="text/javascript" charset="utf-8">
+	// Now that jQuery is done loading, put the '$' variable back to what it was...
+	var $ = _$;
+</script>
 <style type="text/css">
 	@import url({{ BASE_URL }}/__debug__/m/toolbar.min.css);
 </style>
-- 
cgit v1.2.3