aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar
diff options
context:
space:
mode:
authorRob Hudson2008-09-23 10:27:23 -0700
committerRob Hudson2008-09-23 10:27:23 -0700
commitfb5788d8643320724a65890ce3df86d5e2bf591b (patch)
tree52958766f51e4b9a69d9ec05b9e8654383f8e8f8 /debug_toolbar
parentc09b0dbc6e7cefd075819e6a272067f03b8534f1 (diff)
downloaddjango-debug-toolbar-fb5788d8643320724a65890ce3df86d5e2bf591b.tar.bz2
Possible fix for jQuery.noConflict() removing '$' from scope and breaking other
scripts that depend on it.
Diffstat (limited to 'debug_toolbar')
-rw-r--r--debug_toolbar/media/toolbar.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/debug_toolbar/media/toolbar.js b/debug_toolbar/media/toolbar.js
index 19a6abf..455a2fc 100644
--- a/debug_toolbar/media/toolbar.js
+++ b/debug_toolbar/media/toolbar.js
@@ -1,3 +1,4 @@
+var _$ = window.$;
jQuery.noConflict();
jQuery(function($) {
$.djDebug = function(data, klass) {
@@ -62,3 +63,4 @@ jQuery(function($) {
jQuery(function() {
jQuery.djDebug();
});
+$ = _$;